fix(schemas): Fix Edges & Points schemas

SpliiT · SpliiT · commit aca092c3af7b · 2025-06-10T15:30:42.000+02:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -43,6 +43,8 @@ where = ["src"]
 "opengeodeweb_viewer.rpc.mesh.polygons.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.mesh.polyhedra.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.model.schemas" = ["*.json"]
+"opengeodeweb_viewer.rpc.model.edges.schemas" = ["*.json"]
+"opengeodeweb_viewer.rpc.model.points.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.model.corners.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.model.lines.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.model.surfaces.schemas" = ["*.json"]
diff --git a/src/opengeodeweb_viewer/rpc/model/edges/edges_protocols.py b/src/opengeodeweb_viewer/rpc/model/edges/edges_protocols.py
@@ -0,0 +1,27 @@
+# Standard library imports
+import os
+
+# Third party imports
+from wslink import register as exportRpc
+
+# Local application imports
+from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
+from opengeodeweb_viewer.rpc.model.model_protocols import VtkModelView
+
+
+class VtkModelEdgesView(VtkModelView):
+    model_edges_prefix = "opengeodeweb_viewer.model.edges."
+    model_edges_schemas_dict = get_schemas_dict(
+        os.path.join(os.path.dirname(__file__), "schemas")
+    )
+
+    def __init__(self):
+        super().__init__()
+
+    @exportRpc(model_edges_prefix + model_edges_schemas_dict["visibility"]["rpc"])
+    def setModelEdgesVisibility(self, params):
+        validate_schema(
+            params, self.model_edges_schemas_dict["visibility"], self.model_edges_prefix
+        )
+        id, visibility = params["id"], params["visibility"]
+        self.SetEdgesVisibility(id, visibility)
diff --git a/src/opengeodeweb_viewer/rpc/model/edges/schemas/visibility.json b/src/opengeodeweb_viewer/rpc/model/edges/schemas/visibility.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "edges.visibility",
+  "rpc": "visibility",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/model/model_protocols.py b/src/opengeodeweb_viewer/rpc/model/model_protocols.py
@@ -51,27 +51,3 @@ def setModelVisibility(self, params):
         )
         id, visibility = params["id"], params["visibility"]
         self.SetVisibility(id, visibility)
-
-    @exportRpc(model_prefix + model_schemas_dict["points.visibility"]["rpc"])
-    def setModelPointsVisibility(self, params):
-        validate_schema(
-            params, self.model_schemas_dict["points.visibility"], self.model_prefix
-        )
-        id, visibility = params["id"], params["visibility"]
-        self.SetPointsVisibility(id, visibility)
-
-    @exportRpc(model_prefix + model_schemas_dict["points.size"]["rpc"])
-    def setModelPointsSize(self, params):
-        validate_schema(
-            params, self.model_schemas_dict["points.size"], self.model_prefix
-        )
-        id, size = params["id"], params["size"]
-        self.SetPointsSize(id, size)
-
-    @exportRpc(model_prefix + model_schemas_dict["edges.visibility"]["rpc"])
-    def setModelEdgesVisibility(self, params):
-        validate_schema(
-            params, self.model_schemas_dict["edges.visibility"], self.model_prefix
-        )
-        id, visibility = params["id"], params["visibility"]
-        self.SetEdgesVisibility(id, visibility)
diff --git a/src/opengeodeweb_viewer/rpc/model/points/points_protocols.py b/src/opengeodeweb_viewer/rpc/model/points/points_protocols.py
@@ -0,0 +1,33 @@
+# Standard library imports
+import os
+
+# Third party imports
+from wslink import register as exportRpc
+
+# Local application imports
+from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
+from opengeodeweb_viewer.rpc.model.model_protocols import VtkModelView
+
+
+class VtkModelPointsView(VtkModelView):
+    model_points_prefix = "opengeodeweb_viewer.model.points."
+    model_points_schemas_dict = get_schemas_dict(
+        os.path.join(os.path.dirname(__file__), "schemas")
+    )
+
+    def __init__(self):
+        super().__init__()
+
+    @exportRpc(model_points_prefix + model_points_schemas_dict["visibility"]["rpc"])
+    def setModelPointsVisibility(self, params):
+        validate_schema(
+            params, self.model_schemas_dict["visibility"], self.model_prefix
+        )
+        id, visibility = params["id"], params["visibility"]
+        self.SetPointsVisibility(id, visibility)
+
+    @exportRpc(model_points_prefix + model_points_schemas_dict["size"]["rpc"])
+    def setModelPointsSize(self, params):
+        validate_schema(params, self.model_schemas_dict["size"], self.model_prefix)
+        id, size = params["id"], params["size"]
+        self.SetPointsSize(id, size)
diff --git a/src/opengeodeweb_viewer/rpc/model/points/schemas/size.json b/src/opengeodeweb_viewer/rpc/model/points/schemas/size.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "points.size",
+  "rpc": "size",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/model/points/schemas/visibility.json b/src/opengeodeweb_viewer/rpc/model/points/schemas/visibility.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "points.visibility",
+  "rpc": "visibility",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py
@@ -18,6 +18,12 @@
 from .rpc.mesh.polygons.polygons_protocols import VtkMeshPolygonsView
 from .rpc.mesh.polyhedra.polyhedra_protocols import VtkMeshPolyhedraView
 from .rpc.model.model_protocols import VtkModelView
+from .rpc.model.edges.edges_protocols import (
+    VtkModelEdgesView,
+)
+from .rpc.model.points.points_protocols import (
+    VtkModelPointsView,
+)
 from .rpc.model.corners.corners_protocols import (
     VtkModelCornersView,
 )
@@ -79,6 +85,8 @@ def initialize(self):
         self.registerVtkWebProtocol(VtkMeshPolygonsView())
         self.registerVtkWebProtocol(VtkMeshPolyhedraView())
         self.registerVtkWebProtocol(model_protocols)
+        self.registerVtkWebProtocol(VtkModelEdgesView())
+        self.registerVtkWebProtocol(VtkModelPointsView())
         self.registerVtkWebProtocol(VtkModelCornersView())
         self.registerVtkWebProtocol(VtkModelLinesView())
         self.registerVtkWebProtocol(VtkModelSurfacesView())
diff --git a/src/tests/data/images/model/edges/visibility.jpeg b/src/tests/data/images/model/edges/visibility.jpeg
diff --git a/src/tests/data/images/model/points/size.jpeg b/src/tests/data/images/model/points/size.jpeg
diff --git a/src/tests/data/images/model/points/visibility.jpeg b/src/tests/data/images/model/points/visibility.jpeg
diff --git a/src/tests/model/edges/test_model_edges_protocols.py b/src/tests/model/edges/test_model_edges_protocols.py
@@ -0,0 +1,21 @@
+# Standard library imports
+
+# Third party imports
+from opengeodeweb_viewer.rpc.model.edges.edges_protocols import (
+    VtkModelEdgesView,
+)
+
+# Local application imports
+from src.tests.model.test_model_protocols import test_register_model
+
+
+def test_edges_visibility(server):
+
+    test_register_model(server)
+
+    server.call(
+        VtkModelEdgesView.model_edges_prefix
+        + VtkModelEdgesView.model_edges_schemas_dict["visibility"]["rpc"],
+        [{"id": "123456789", "visibility": True}],
+    )
+    assert server.compare_image(3, "model/edges/visibility.jpeg") == True
diff --git a/src/tests/model/points/test_model_points_protocols.py b/src/tests/model/points/test_model_points_protocols.py
@@ -0,0 +1,33 @@
+# Standard library imports
+
+# Third party imports
+from opengeodeweb_viewer.rpc.model.points.points_protocols import (
+    VtkModelPointsView,
+)
+
+# Local application imports
+from src.tests.model.test_model_protocols import test_register_model
+
+
+def test_points_visibility(server):
+
+    test_register_model(server)
+
+    server.call(
+        VtkModelPointsView.model_points_prefix
+        + VtkModelPointsView.model_points_schemas_dict["visibility"]["rpc"],
+        [{"id": "123456789", "visibility": True}],
+    )
+    assert server.compare_image(3, "model/points/visibility.jpeg") == True
+
+
+def test_points_size(server):
+
+    test_points_visibility(server)
+
+    server.call(
+        VtkModelPointsView.model_points_prefix
+        + VtkModelPointsView.model_points_schemas_dict["size"]["rpc"],
+        [{"id": "123456789", "size": 20}],
+    )
+    assert server.compare_image(3, "model/points/size.jpeg") == True
diff --git a/src/tests/model/test_model_protocols.py b/src/tests/model/test_model_protocols.py
@@ -41,39 +41,3 @@ def test_deregister_model(server):
         [{"id": "123456789"}],
     )
     assert server.compare_image(3, "model/deregister.jpeg") == True
-
-
-def test_edges_visibility(server):
-
-    test_register_model(server)
-
-    server.call(
-        VtkModelView.model_prefix
-        + VtkModelView.model_schemas_dict["edges.visibility"]["rpc"],
-        [{"id": "123456789", "visibility": True}],
-    )
-    assert server.compare_image(3, "model/edges.visibility.jpeg") == True
-
-
-def test_points_visibility(server):
-
-    test_register_model(server)
-
-    server.call(
-        VtkModelView.model_prefix
-        + VtkModelView.model_schemas_dict["points.visibility"]["rpc"],
-        [{"id": "123456789", "visibility": True}],
-    )
-    assert server.compare_image(3, "model/points.visibility.jpeg") == True
-
-
-def test_points_size(server):
-
-    test_points_visibility(server)
-
-    server.call(
-        VtkModelView.model_prefix
-        + VtkModelView.model_schemas_dict["points.size"]["rpc"],
-        [{"id": "123456789", "size": 20}],
-    )
-    assert server.compare_image(3, "model/points.size.jpeg") == True

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "edges.visibility",`
	`2`	`+ "rpc": "visibility",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "points.size",`
	`2`	`+ "rpc": "size",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "points.visibility",`
	`2`	`+ "rpc": "visibility",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`