[Fixes #257] Add RemoteResourceHandler

importer/api/views.py

@@ -130,7 +130,7 @@ def create(self, request, *args, **kwargs):
         handler = orchestrator.get_handler(_data)
 
         # not file but handler means that is a remote resource
-        if (_file and handler) or (not _file and handler):
+        if handler:
             asset = None
             files = []
             try:

importer/handlers/base.py

@@ -91,7 +91,7 @@ def can_handle_sld_file(self) -> bool:
         return True
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         Define basic validation steps
         """

importer/handlers/common/raster.py

@@ -54,7 +54,7 @@ def get_geoserver_store_name(default=None):
         return default, False
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         Define basic validation steps
         """

importer/handlers/common/remote.py

@@ -62,7 +62,7 @@ def can_handle(_data) -> bool:
         return True
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         We mark it as valid if the urls is reachable
         and if the url is valid
@@ -195,7 +195,7 @@ def create_link(self, resource, params: dict, name):
             resource=resource,
             extension=params.get("type"),
             url=params.get("url"),
-            link_type="remote",
+            link_type="data",
             name=name,
         )
         link.save()

importer/handlers/common/vector.py

@@ -63,7 +63,7 @@ def get_geoserver_store_name(default=None):
         return os.environ.get("GEONODE_GEODATABASE", "geonode_data"), True
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         Define basic validation steps
         """

importer/handlers/csv/handler.py

@@ -74,7 +74,7 @@ def can_handle(_data) -> bool:
         )
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         BaseVectorFileHandler.is_valid(files, user)
         # getting the upload limit validation
         upload_validator = UploadLimitValidator(user)

importer/handlers/geojson/handler.py

@@ -78,7 +78,7 @@ def can_handle(_data) -> bool:
         return False
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         Define basic validation steps:
         """

importer/handlers/geotiff/handler.py

@@ -59,7 +59,7 @@ def can_handle(_data) -> bool:
         return ext in ["tiff", "geotiff", "tif", "geotif"]
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         Define basic validation steps:
         """

importer/handlers/gpkg/handler.py

@@ -73,7 +73,7 @@ def can_handle(_data) -> bool:
         )
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         Define basic validation steps:
         Upload limit:

importer/handlers/kml/handler.py

@@ -73,7 +73,7 @@ def can_handle(_data) -> bool:
         )
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         Define basic validation steps:
         Upload limit:

importer/handlers/shapefile/handler.py

@@ -97,7 +97,7 @@ def extract_params_from_data(_data, action=None):
         return additional_params, _data
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         Define basic validation steps:
         """

importer/handlers/sld/handler.py

@@ -30,7 +30,7 @@ def can_handle(_data) -> bool:
         )
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         Define basic validation steps
         """

importer/handlers/tiles3d/handler.py

@@ -66,7 +66,7 @@ def can_handle(_data) -> bool:
         return False
 
     @staticmethod
-    def is_valid(files, user, _execid=None):
+    def is_valid(files, user):
         """
         Define basic validation steps:
         """

importer/handlers/tiles3d/tests.py

@@ -399,8 +399,8 @@ def test_set_bbox_from_bounding_volume_sphere_with_transform(self):
 
         self.assertEqual(resource.bbox_x0, -75.61213927392595)
         self.assertEqual(resource.bbox_x1, -75.61204934172301)
-        self.assertEqual(resource.bbox_y0, 40.042485645323616)
-        self.assertEqual(resource.bbox_y1, 40.042575577526556)
+        self.assertEqual(resource.bbox_y0, 40.04248564532361)
+        self.assertEqual(resource.bbox_y1, 40.04257557752655)
 
         os.remove("/tmp/tileset.json")
 

runtest.sh

@@ -3,4 +3,4 @@ set -a
 . ./.env_test
 set +a 
 
-coverage run --source='.' --omit="*/test*" /usr/src/geonode/manage.py test importer -v2 --noinput
+coverage run --source='.' --omit="*/test*" /usr/src/geonode/manage.py test importer.tests -v2 --noinput --keepdb