get_viewer_object_type new function

Author: MaxNumerique

src/opengeodeweb_viewer/rpc/generic/generic_protocols.py

@@ -26,8 +26,8 @@ def register(self, params):
         validate_schema(
             params, self.generic_schemas_dict["register"], self.generic_prefix
         )
-        viewer_object = params["viewer_object"]
-        params.pop("viewer_object", None)
+        data_id = params["id"]
+        viewer_object = self.get_viewer_object_type(data_id)
         if viewer_object == "mesh":
             self.mesh_protocols.registerMesh(params)
         elif viewer_object == "model":
@@ -38,8 +38,8 @@ def deregister(self, params):
         validate_schema(
             params, self.generic_schemas_dict["deregister"], self.generic_prefix
         )
-        viewer_object = params["viewer_object"]
-        params.pop("viewer_object", None)
+        data_id = params["id"]
+        viewer_object = self.get_viewer_object_type(data_id)
         if viewer_object == "mesh":
             self.mesh_protocols.deregisterMesh(params)
         elif viewer_object == "model":

src/opengeodeweb_viewer/vtk_protocol.py

@@ -24,6 +24,14 @@ def get_data_base(self) -> dict[str, dict[str, object | str]]:
     def get_object(self, id: str) -> dict[str, object | str]:
         return self.get_data_base()[id]
 
+    def get_viewer_object_type(self, data_id: str) -> str:
+        data = self.get_data(data_id)
+        geode_object = data.get("geode_object")
+        if geode_object == "mesh":
+            return "mesh"
+        elif geode_object == "model":
+            return "model"
+
     def get_data(self, data_id: str) -> dict[str, str | list[str] | None]:
         if Data is None:
             raise Exception("Data model not available")