diff --git a/osgeo_importer/admin.py b/osgeo_importer/admin.py index 8780a0f..e76aabc 100644 --- a/osgeo_importer/admin.py +++ b/osgeo_importer/admin.py @@ -18,7 +18,6 @@ class UploadedDataAdmin(admin.ModelAdmin): class UploadExceptionAdmin(admin.ModelAdmin): model = UploadException - admin.site.register(UploadException, UploadExceptionAdmin) admin.site.register(UploadLayer, UploadedLayerAdmin) admin.site.register(UploadedData, UploadedDataAdmin) diff --git a/osgeo_importer/handlers/geonode/publish_handler.py b/osgeo_importer/handlers/geonode/publish_handler.py index bc2d0ac..bf756fe 100644 --- a/osgeo_importer/handlers/geonode/publish_handler.py +++ b/osgeo_importer/handlers/geonode/publish_handler.py @@ -108,13 +108,11 @@ def handle(self, layer, layer_config, *args, **kwargs): 'owner': owner, 'uuid': layer_uuid, } - styles = Style.objects.filter(name=layer_name) if len(styles) > 0: new_layer_kwargs.update({ 'default_style': styles[0] }) - if 'category' in layer_config: try: category = TopicCategory.objects.get(id=layer_config.get('category')) diff --git a/osgeo_importer/inspectors.py b/osgeo_importer/inspectors.py index 158fe9f..7a1360c 100644 --- a/osgeo_importer/inspectors.py +++ b/osgeo_importer/inspectors.py @@ -4,11 +4,8 @@ from django import db from django.conf import settings -try: - import gdal - import ogr -except: - from osgeo import gdal, ogr +import gdal +import ogr from osgeo_importer.utils import NoDataSourceFound, GDAL_GEOMETRY_TYPES, increment, timeparse, quote_ident, parse diff --git a/osgeo_importer/static/osgeo_importer/package.json b/osgeo_importer/static/osgeo_importer/package.json index f5f6458..edd0e30 100644 --- a/osgeo_importer/static/osgeo_importer/package.json +++ b/osgeo_importer/static/osgeo_importer/package.json @@ -5,15 +5,15 @@ "main": "importer.js", "dependencies": { "underscore": "1.8.3", - "angular": "1.6.5", - "angular-resource": "1.6.5", + "angular": "1.3.0", + "angular-resource": "1.3.0", "angular-ui-bootstrap": "0.14.2", "angular-file-upload": "2.2.0", - "angular-cookies": "1.6.5", + "angular-cookies": "1.3.0", "angular-wizard": "0.5.5" }, "devDependencies": { - "angular-mocks": "1.6.5", + "angular-mocks": "1.3.0", "requirejs": "^2.1.0", "watchify": ">=3", "browserify": ">=10", diff --git a/osgeo_importer/utils.py b/osgeo_importer/utils.py index d0e4cbe..a76d6a9 100644 --- a/osgeo_importer/utils.py +++ b/osgeo_importer/utils.py @@ -23,7 +23,6 @@ except: from osgeo import gdal, ogr, osr - logger = logging.getLogger(__name__) try: @@ -567,7 +566,6 @@ def configure_upload(self, upload, files): with db.transaction.atomic(): while UploadLayer.objects.filter(name=layer_name).exists(): layer_name = self.uniquish_layer_name(layer_basename) - fields = layer_desc.get('fields', {}) upload_layer = UploadLayer( upload_file=upfile, @@ -582,7 +580,7 @@ def configure_upload(self, upload, files): ) # If we wait for upload.save(), we may introduce layer_name collisions. upload_layer.save() - + upload.uploadlayer_set.add(upload_layer) upload.complete = True diff --git a/osgeo_importer_prj/settings.py b/osgeo_importer_prj/settings.py index 7aad26f..2cdf152 100644 --- a/osgeo_importer_prj/settings.py +++ b/osgeo_importer_prj/settings.py @@ -168,5 +168,6 @@ # Lifetime Quota for User Uploads in Bytes, defaults to 140M (big enough it won't trip other tests) for tests USER_UPLOAD_QUOTA = 140000000 - # 0 is read-only + +# 0 is read-only GDAL_ACCESS_MODE = 0