feat(collectionsRandomColor): Add prop to schemas to group collection…

opengeodeweb_viewer_schemas.json

@@ -1495,6 +1495,10 @@
                 "random"
               ]
             },
+            "collection_id": {
+              "type": "string",
+              "minLength": 1
+            },
             "color": {
               "type": "object",
               "properties": {
@@ -1673,6 +1677,10 @@
                 "random"
               ]
             },
+            "collection_id": {
+              "type": "string",
+              "minLength": 1
+            },
             "color": {
               "type": "object",
               "properties": {
@@ -1956,6 +1964,10 @@
                 "random"
               ]
             },
+            "collection_id": {
+              "type": "string",
+              "minLength": 1
+            },
             "color": {
               "type": "object",
               "properties": {
@@ -2359,6 +2371,10 @@
                 "random"
               ]
             },
+            "collection_id": {
+              "type": "string",
+              "minLength": 1
+            },
             "color": {
               "type": "object",
               "properties": {

requirements.txt

@@ -63,4 +63,3 @@ wslink==1.12.4
 yarl==1.*
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.2.2

src/opengeodeweb_viewer/rpc/model/blocks/model_blocks_protocols.py

@@ -40,5 +40,9 @@ def setModelBlocksColor(self, rpc_params: RpcParams) -> list[ColorResult]:
         params = schemas.Color.from_dict(rpc_params)
         pipeline = self.get_vtk_pipeline(params.id)
         return self.apply_color(
-            pipeline, params.block_ids, params.color_mode.value, params.color
+            pipeline,
+            params.block_ids,
+            params.color_mode.value,
+            params.color,
+            params.collection_id,
         )

src/opengeodeweb_viewer/rpc/model/blocks/schemas/color.json

@@ -15,6 +15,10 @@
       "type": "string",
       "enum": ["constant", "random"]
     },
+    "collection_id": {
+      "type": "string",
+      "minLength": 1
+    },
     "color": {
       "type": "object",
       "properties": {

src/opengeodeweb_viewer/rpc/model/blocks/schemas/color.py

@@ -28,4 +28,5 @@ def __post_init__(self) -> None:
     block_ids: List[int]
     color_mode: ColorMode
     id: str
+    collection_id: Optional[str] = None
     color: Optional[ColorClass] = None

src/opengeodeweb_viewer/rpc/model/corners/model_corners_protocols.py

@@ -40,5 +40,9 @@ def setModelCornersColor(self, rpc_params: RpcParams) -> list[ColorResult]:
         params = schemas.Color.from_dict(rpc_params)
         pipeline = self.get_vtk_pipeline(params.id)
         return self.apply_color(
-            pipeline, params.block_ids, params.color_mode.value, params.color
+            pipeline,
+            params.block_ids,
+            params.color_mode.value,
+            params.color,
+            params.collection_id,
         )

src/opengeodeweb_viewer/rpc/model/corners/schemas/color.json

@@ -15,6 +15,10 @@
       "type": "string",
       "enum": ["constant", "random"]
     },
+    "collection_id": {
+      "type": "string",
+      "minLength": 1
+    },
     "color": {
       "type": "object",
       "properties": {

src/opengeodeweb_viewer/rpc/model/corners/schemas/color.py

@@ -28,4 +28,5 @@ def __post_init__(self) -> None:
     block_ids: List[int]
     color_mode: ColorMode
     id: str
+    collection_id: Optional[str] = None
     color: Optional[ColorClass] = None

src/opengeodeweb_viewer/rpc/model/lines/model_lines_protocols.py

@@ -40,5 +40,9 @@ def setModelLinesColor(self, rpc_params: RpcParams) -> list[ColorResult]:
         params = schemas.Color.from_dict(rpc_params)
         pipeline = self.get_vtk_pipeline(params.id)
         return self.apply_color(
-            pipeline, params.block_ids, params.color_mode.value, params.color
+            pipeline,
+            params.block_ids,
+            params.color_mode.value,
+            params.color,
+            params.collection_id,
         )

src/opengeodeweb_viewer/rpc/model/lines/schemas/color.json

@@ -15,6 +15,10 @@
       "type": "string",
       "enum": ["constant", "random"]
     },
+    "collection_id": {
+      "type": "string",
+      "minLength": 1
+    },
     "color": {
       "type": "object",
       "properties": {

src/opengeodeweb_viewer/rpc/model/lines/schemas/color.py

@@ -28,4 +28,5 @@ def __post_init__(self) -> None:
     block_ids: List[int]
     color_mode: ColorMode
     id: str
+    collection_id: Optional[str] = None
     color: Optional[ColorClass] = None

src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -68,6 +68,7 @@ def apply_color(
         block_ids: list[int],
         color_mode: str,
         color: Optional[ColorProtocol] = None,
+        collection_id: Optional[str] = None,
     ) -> list[ColorResult]:
         mapper = pipeline.mapper
         if not isinstance(mapper, vtkCompositePolyDataMapper):
@@ -82,7 +83,9 @@ def apply_color(
             if isinstance(block_dataset, vtkDataSet):
                 if color_mode == "random":
                     geode_id = pipeline.blockGeodeIds[block_id]
-                    red, green, blue = deterministic_color(f"{geode_id}_{block_id}")
+                    red, green, blue = deterministic_color(
+                        collection_id or f"{geode_id}_{block_id}"
+                    )
                     attr.SetBlockColor(block_dataset, [red, green, blue])
                     attr.SetBlockOpacity(block_dataset, 1.0)
                     colors.append(

src/opengeodeweb_viewer/rpc/model/surfaces/model_surfaces_protocols.py

@@ -40,5 +40,9 @@ def setModelSurfacesColor(self, rpc_params: RpcParams) -> list[ColorResult]:
         params = schemas.Color.from_dict(rpc_params)
         pipeline = self.get_vtk_pipeline(params.id)
         return self.apply_color(
-            pipeline, params.block_ids, params.color_mode.value, params.color
+            pipeline,
+            params.block_ids,
+            params.color_mode.value,
+            params.color,
+            params.collection_id,
         )

src/opengeodeweb_viewer/rpc/model/surfaces/schemas/color.json

@@ -15,6 +15,10 @@
       "type": "string",
       "enum": ["constant", "random"]
     },
+    "collection_id": {
+      "type": "string",
+      "minLength": 1
+    },
     "color": {
       "type": "object",
       "properties": {

src/opengeodeweb_viewer/rpc/model/surfaces/schemas/color.py

@@ -28,4 +28,5 @@ def __post_init__(self) -> None:
     block_ids: List[int]
     color_mode: ColorMode
     id: str
+    collection_id: Optional[str] = None
     color: Optional[ColorClass] = None

tests/model/surfaces/test_model_surfaces_protocols.py

@@ -84,6 +84,31 @@ def test_surfaces_polygons_random_color(
     assert server.compare_image("model/surfaces/random_color.jpeg") == True
 
 
+def test_surfaces_polygons_random_collection_id(
+    server: ServerMonitor, dataset_factory: Callable[..., str]
+) -> None:
+
+    test_surfaces_polygons_visibility(server, dataset_factory)
+
+    server.call(
+        VtkModelSurfacesView.model_surfaces_prefix
+        + VtkModelSurfacesView.model_surfaces_schemas_dict["color"]["rpc"],
+        [
+            {
+                "id": model_id,
+                "block_ids": list(range(36, 47)),
+                "color_mode": "random",
+                "collection_id": "collection",
+            }
+        ],
+    )
+    response = server.get_response()
+    assert isinstance(response, dict)
+    colors = [result["color"] for result in response["result"]]
+    assert len(colors) == 11
+    assert all(color == colors[0] for color in colors)
+
+
 def test_surfaces_clipping_plane(
     server: ServerMonitor, dataset_factory: Callable[..., str]
 ) -> None: