fixes

Author: BotellaA

src/opengeodeweb_viewer/rpc/mesh/edges/mesh_edges_protocols.py

@@ -47,5 +47,5 @@ def setMeshEdgesWidth(self, rpc_params: RpcParams) -> None:
         validate_schema(
             rpc_params, self.mesh_edges_schemas_dict["width"], self.mesh_edges_prefix
         )
-        params = schemas.Color.from_dict(rpc_params)
+        params = schemas.Width.from_dict(rpc_params)
         self.SetEdgesWidth(params.id, params.width)

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -15,7 +15,6 @@
     get_schemas_dict,
     validate_schema,
     RpcParams,
-    RpcParamsWithColor,
 )
 from opengeodeweb_viewer.object.object_methods import VtkObjectView
 from opengeodeweb_viewer.vtk_protocol import vtkData
@@ -92,7 +91,7 @@ def setMeshOpacity(self, rpc_params: RpcParams) -> None:
         self.SetOpacity(params.id, params.opacity)
 
     @exportRpc(mesh_prefix + mesh_schemas_dict["color"]["rpc"])
-    def setMeshColor(self, rpc_params: RpcParamsWithColor) -> None:
+    def setMeshColor(self, rpc_params: RpcParams) -> None:
         validate_schema(rpc_params, self.mesh_schemas_dict["color"], self.mesh_prefix)
         params = schemas.Color.from_dict(rpc_params)
         color = params.color

src/opengeodeweb_viewer/rpc/mesh/points/mesh_points_protocols.py

@@ -9,7 +9,6 @@
     get_schemas_dict,
     validate_schema,
     RpcParams,
-    RpcParamsWithColor,
 )
 from opengeodeweb_viewer.rpc.mesh.mesh_protocols import VtkMeshView
 from . import schemas
@@ -35,7 +34,7 @@ def setMeshPointsVisibility(self, rpc_params: RpcParams) -> None:
         self.SetPointsVisibility(params.id, params.visibility)
 
     @exportRpc(mesh_points_prefix + mesh_points_schemas_dict["color"]["rpc"])
-    def setMeshPointsColor(self, rpc_params: RpcParamsWithColor) -> None:
+    def setMeshPointsColor(self, rpc_params: RpcParams) -> None:
         validate_schema(
             rpc_params, self.mesh_points_schemas_dict["color"], self.mesh_points_prefix
         )
@@ -59,4 +58,4 @@ def setMeshPointsVertexAttribute(self, rpc_params: RpcParams) -> None:
             self.mesh_points_prefix,
         )
         params = schemas.VertexAttribute.from_dict(rpc_params)
-        self.displayAttributeOnVertices(params.id, pramas.name)
+        self.displayAttributeOnVertices(params.id, params.name)

src/opengeodeweb_viewer/rpc/mesh/polygons/polygons_protocols.py

@@ -65,5 +65,5 @@ def setMeshPolygonsPolygonAttribute(self, rpc_params: RpcParams) -> None:
             self.mesh_polygons_schemas_dict["polygon_attribute"],
             self.mesh_polygons_prefix,
         )
-        params = schemas.Color.from_dict(rpc_params)
+        params = schemas.PolygonAttribute.from_dict(rpc_params)
         self.displayAttributeOnCells(params.id, params.name)

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -23,8 +23,6 @@
     get_schemas_dict,
     validate_schema,
     RpcParams,
-    RpcParamsWithColor,
-    RpcParamsWithList,
 )
 from opengeodeweb_viewer.vtk_protocol import VtkView
 from . import schemas
@@ -97,7 +95,7 @@ def resetVisualization(self, rpc_params: RpcParams) -> None:
         self.render()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["set_background_color"]["rpc"])
-    def setBackgroundColor(self, rpc_params: RpcParamsWithColor) -> None:
+    def setBackgroundColor(self, rpc_params: RpcParams) -> None:
         validate_schema(
             rpc_params,
             self.viewer_schemas_dict["set_background_color"],
@@ -147,16 +145,16 @@ def takeScreenshot(self, rpc_params: RpcParams) -> dict[str, str | bytes]:
         w2if.ReadFrontBufferOff()
         w2if.Update()
         output_extension = params.output_extension
-        if output_extension == "png":
+        if output_extension == schemas.OutputExtension.PNG:
             writer = vtkPNGWriter()
-        elif output_extension in ["jpg", "jpeg"]:
+        elif output_extension == schemas.OutputExtension.JPG:
             if not include_background:
                 raise Exception("output_extension not supported with background")
             writer = vtkJPEGWriter()
         else:
             raise Exception("output_extension not supported")
 
-        new_filename = params.filename + "." + output_extension
+        new_filename = params.filename + "." + output_extension.value
         file_path = os.path.join(self.DATA_FOLDER_PATH, new_filename)
         writer.SetFileName(file_path)
         writer.SetInputConnection(w2if.GetOutputPort())
@@ -219,7 +217,7 @@ def computeEpsilon(self, renderer: vtkRenderer, z: float) -> float:
         return math.sqrt(epsilon) * 0.0125
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["picked_ids"]["rpc"])
-    def pickedIds(self, rpc_params: RpcParamsWithList) -> dict[str, list[str]]:
+    def pickedIds(self, rpc_params: RpcParams) -> dict[str, list[str]]:
         validate_schema(
             rpc_params, self.viewer_schemas_dict["picked_ids"], self.viewer_prefix
         )
@@ -275,11 +273,11 @@ def updateCamera(self, rpc_params: RpcParams) -> None:
         renderWindow = self.getView("-1")
         camera = renderWindow.GetRenderers().GetFirstRenderer().GetActiveCamera()
 
-        camera.SetFocalPoint(*camara_options.focal_point)
-        camera.SetViewUp(*camara_options.view_up)
-        camera.SetPosition(*camara_options.position)
-        camera.SetViewAngle(camara_options.view_angle)
-        camera.SetClippingRange(*camara_options.clipping_range)
+        camera.SetFocalPoint(camera_options.focal_point)
+        camera.SetViewUp(camera_options.view_up)
+        camera.SetPosition(camera_options.position)
+        camera.SetViewAngle(camera_options.view_angle)
+        camera.SetClippingRange(camera_options.clipping_range)
         self.render()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["render_now"]["rpc"])

src/opengeodeweb_viewer/utils_functions.py

@@ -6,14 +6,7 @@
 # Third party imports
 import fastjsonschema  # type: ignore
 
-type JsonPrimitive = str | int | float | bool
-type JsonValue = JsonPrimitive | dict[str, JsonValue] | list[JsonValue]
 type RpcParams = dict[str, str]
-
-type ColorDict = dict[str, int]
-type RpcParamsWithColor = dict[str, JsonPrimitive | ColorDict]
-type RpcParamsWithList = dict[str, JsonPrimitive | list[str]]
-
 type SchemaDict = dict[str, str]
 
 

src/opengeodeweb_viewer/vtk_protocol.py

@@ -1,7 +1,7 @@
 # Standard library imports
 import os
 from typing import cast, Any, Literal
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 # Third party imports
 from vtk.web import protocols as vtk_protocols  # type: ignore
@@ -25,7 +25,7 @@ class vtkData:
     reader: vtkAlgorithm
     mapper: vtkMapper
     filter: vtkAlgorithm | None = None
-    actor: vtkActor = vtkActor()
+    actor: vtkActor = field(default_factory=vtkActor)
     max_dimension: Literal["points", "edges", "polygons", "polyhedra", "default"] = (
         "default"
     )

src/opengeodeweb_viewer/vtkw_server.py

@@ -4,7 +4,7 @@
 
 # Third party imports
 from vtk.web import wslink as vtk_wslink  # type: ignore
-from vtk.web import protocols as vtk_protocols  # type: ignore
+from vtk.web import protocols as vtk_protocols
 from wslink import server  # type: ignore
 from vtkmodules.vtkRenderingCore import vtkRenderer, vtkRenderWindow
 from opengeodeweb_microservice.database import connection