wip

Author: BotellaA

src/opengeodeweb_viewer/rpc/generic/generic_protocols.py

@@ -7,26 +7,28 @@
 
 # Local application imports
 from opengeodeweb_viewer.vtk_protocol import VtkView
+from opengeodeweb_viewer.rpc.mesh.mesh_protocols import VtkMeshView
+from opengeodeweb_viewer.rpc.model.model_protocols import VtkModelView
 from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
+from . import schemas
 
 
 class VtkGenericView(VtkView):
-    generic_prefix = "opengeodeweb_viewer.generic."
-    generic_schemas_dict = get_schemas_dict(
-        os.path.join(os.path.dirname(__file__), "schemas")
-    )
+    prefix = "opengeodeweb_viewer.generic."
+    schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
 
-    def __init__(self, mesh_protocols, model_protocols):
+    def __init__(
+        self, mesh_protocols: VtkMeshView, model_protocols: VtkModelView
+    ) -> None:
         super().__init__()
         self.mesh_protocols = mesh_protocols
         self.model_protocols = model_protocols
 
-    @exportRpc(generic_prefix + generic_schemas_dict["register"]["rpc"])
+    @exportRpc(prefix + schemas_dict["register"]["rpc"])
     def register(self, params):
-        validate_schema(
-            params, self.generic_schemas_dict["register"], self.generic_prefix
-        )
-        data_id = str(params["id"])
+        validate_schema(params, self.schemas_dict["register"], self.prefix)
+        params = schemas.Register.from_dict(params)
+        data_id = params.id
         specific_params = {"id": data_id}
         data = self.get_data(data_id)
         viewer_object = str(data["viewer_object"])
@@ -35,12 +37,11 @@ def register(self, params):
         elif viewer_object == "model":
             self.model_protocols.registerModel(specific_params)
 
-    @exportRpc(generic_prefix + generic_schemas_dict["deregister"]["rpc"])
+    @exportRpc(prefix + schemas_dict["deregister"]["rpc"])
     def deregister(self, params):
-        validate_schema(
-            params, self.generic_schemas_dict["deregister"], self.generic_prefix
-        )
-        data_id = str(params["id"])
+        validate_schema(params, self.schemas_dict["deregister"], self.prefix)
+        params = schemas.Deregister.from_dict(params)
+        data_id = params.id
         specific_params = {"id": data_id}
         data = self.get_data(data_id)
         viewer_object = str(data["viewer_object"])

src/opengeodeweb_viewer/rpc/generic/schemas/__init__.py

@@ -0,0 +1,2 @@
+from .register import *
+from .deregister import *

src/opengeodeweb_viewer/rpc/generic/schemas/deregister.py

@@ -0,0 +1,7 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+
+
+@dataclass
+class Deregister(DataClassJsonMixin):
+    id: str

src/opengeodeweb_viewer/rpc/generic/schemas/register.py

@@ -0,0 +1,7 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+
+
+@dataclass
+class Register(DataClassJsonMixin):
+    id: str

src/opengeodeweb_viewer/rpc/mesh/edges/schemas/__init__.py

@@ -0,0 +1,5 @@
+from .width import *
+from .visibility import *
+from .vertex_attribute import *
+from .size import *
+from .color import *

src/opengeodeweb_viewer/rpc/mesh/edges/schemas/color.py

@@ -0,0 +1,17 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+from typing import Optional
+
+
+@dataclass
+class ColorClass(DataClassJsonMixin):
+    b: int
+    g: int
+    r: int
+    a: Optional[float] = None
+
+
+@dataclass
+class Color(DataClassJsonMixin):
+    color: ColorClass
+    id: str

src/opengeodeweb_viewer/rpc/mesh/edges/schemas/size.py

@@ -0,0 +1,8 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+
+
+@dataclass
+class Size(DataClassJsonMixin):
+    id: str
+    size: int

src/opengeodeweb_viewer/rpc/mesh/edges/schemas/vertex_attribute.py

@@ -0,0 +1,8 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+
+
+@dataclass
+class VertexAttribute(DataClassJsonMixin):
+    id: str
+    name: str

src/opengeodeweb_viewer/rpc/mesh/edges/schemas/visibility.py

@@ -0,0 +1,8 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+
+
+@dataclass
+class Visibility(DataClassJsonMixin):
+    id: str
+    visibility: bool

src/opengeodeweb_viewer/rpc/mesh/edges/schemas/width.py

@@ -0,0 +1,8 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+
+
+@dataclass
+class Width(DataClassJsonMixin):
+    id: str
+    width: float