Fix 3dtile handling

Author: mattiagiupponi

geonode/upload/handlers/base.py

@@ -309,7 +309,7 @@ def delete_resource(instance):
     def _get_execution_request_object(self, execution_id: str):
         return ExecutionRequest.objects.filter(exec_id=execution_id).first()
 
-    def create_asset_and_link(self, resource, files, action=None, asset_name=None):
+    def create_asset_and_link(self, resource, files, action=None, asset_name=None, asset_type=None, **kwargs):
         if not files:
             return
         asset_name = asset_name or (
@@ -318,10 +318,11 @@ def create_asset_and_link(self, resource, files, action=None, asset_name=None):
         asset, _ = create_asset_and_link(
             resource=resource,
             owner=resource.owner,
-            files=files.values(),
+            files=list(set(files.values())),
             title=asset_name,
-            asset_type=Path(files.get("base_file")).suffix.replace(".", ""),
+            asset_type=asset_type or Path(files.get("base_file")).suffix.replace(".", ""),
             clone_files=True,
+            **kwargs,
         )
         return asset
 

geonode/upload/handlers/tiles3d/handler.py

@@ -228,6 +228,17 @@ def import_resource(self, files: dict, execution_id: str, **kwargs) -> str:
         )
         return layer_name, alternate, execution_id
 
+    def pre_processing(self, files, execution_id, **kwargs):
+        _data, execution_id = super().pre_processing(files, execution_id, **kwargs)
+        # removing the content file from the files location
+        if "content_file" in _data["files"]:
+            _data["files"].pop("content_file")
+
+        _exec_obj = orchestrator.get_execution_object(execution_id)
+        orchestrator.update_execution_request_obj(_exec_obj, {"input_params": _data})
+
+        return _data, execution_id
+
     def create_geonode_resource(
         self,
         layer_name: str,
@@ -236,13 +247,16 @@ def create_geonode_resource(
         resource_type: Dataset = ...,
         asset=None,
     ):
-        # we want just the tileset.json as location of the asset
-        # asset.location = [path for path in asset.location if path.endswith(".json")]
-        # asset.save()
         exec_obj = orchestrator.get_execution_object(execution_id)
 
         resource = super().create_geonode_resource(layer_name, alternate, execution_id, ResourceBase, asset)
-        asset = self.create_asset_and_link(resource, files=exec_obj.input_params["files"], action=exec_obj.action)
+        asset = self.create_asset_and_link(
+            resource,
+            files=exec_obj.input_params["files"],
+            action=exec_obj.action,
+            asset_type="3dtiles",
+            extension="3dtiles",
+        )
 
         if isinstance(asset, LocalAsset):
             # fixing-up bbox for the 3dtile object