cleanup

Author: MaxNumerique

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -274,17 +274,10 @@ def pickedIds(self, rpc_params: RpcParams) -> dict[str, list[str] | int | None]:
         ]
         if not array_ids:
             return {"array_ids": [], "viewer_id": None}
-        # Map flat_index to None if it is -1 (no composite block picked)
         viewer_id = flat_index if flat_index != -1 else None
         if viewer_id is not None:
             pipeline = self.get_vtk_pipeline(array_ids[0])
-            # Verify composite block visibility (discard pick if block is hidden)
-            dataset, geode_id, is_visible = self.get_composite_block_info(
-                pipeline, picker
-            )
-            if not is_visible:
-                return {"array_ids": [], "viewer_id": None}
-
+            dataset, geode_id = self.get_composite_block_info(pipeline, picker)
         return {
             "array_ids": array_ids,
             "viewer_id": viewer_id,
@@ -342,26 +335,19 @@ def setHighlight(
             rpc_params, self.viewer_schemas_dict["highlight"], self.viewer_prefix
         )
         params = schemas.Highlight.from_dict(rpc_params)
-
         # Clear previous highlights
         self.clear_highlights(params.ids)
         picker = vtkCellPicker(tolerance=0.005)
-
         # Perform pick operation to identify clicked pipeline and primitive ID
         data_id, id_to_select = self.pick_cell_or_point(
             params.ids, params.x, params.y, params.field_type.value, picker
         )
         if not data_id or id_to_select == -1:
             self.render(-1)
             return {}
-
-        # Retrieve picked composite block information and check block visibility
+        # Retrieve picked composite block information
         pipeline = self.get_vtk_pipeline(data_id)
-        dataset, geode_id, is_visible = self.get_composite_block_info(pipeline, picker)
-        if not is_visible:
-            self.render(-1)
-            return {}
-
+        dataset, geode_id = self.get_composite_block_info(pipeline, picker)
         # Update highlight visibility and extract attributes from the picked element
         self.update_highlight(pipeline, id_to_select, params.field_type.value, dataset)
         self.render(-1)

src/opengeodeweb_viewer/vtk_protocol.py

@@ -218,7 +218,6 @@ def pick_cell_or_point(
             picker.Pick(x, y, 0, self.get_renderer())
         finally:
             self.swap_pick_mappers(data_ids, use_pick_mapper=False)
-
         actor = picker.GetActor()
         # Find which pipeline owns the picked actor
         data_id = next(
@@ -256,27 +255,20 @@ def pick_actors_under_coordinate(
 
     def get_composite_block_info(
         self, pipeline: VtkPipeline, picker: vtkCellPicker
-    ) -> tuple[vtkDataObject | None, str | None, bool]:
+    ) -> tuple[vtkDataObject | None, str | None]:
         # Extract the specific block dataset and metadata from a picked composite flat index
         if not isinstance(pipeline.mapper, vtkCompositePolyDataMapper):
-            return None, None, True
+            return None, None
         flat_index = picker.GetFlatBlockIndex()
         if not (0 <= flat_index < len(pipeline.blockDataSets)):
-            return None, None, True
-
+            return None, None
         dataset = pipeline.blockDataSets[flat_index]
-        if dataset:
-            # Extra safety check on the display visibility attribute
-            attr = pipeline.mapper.GetCompositeDataDisplayAttributes()
-            if attr and not attr.GetBlockVisibility(dataset):
-                return None, None, False
-
         geode_id = (
             pipeline.blockGeodeIds[flat_index]
             if flat_index < len(pipeline.blockGeodeIds)
             else None
         )
-        return dataset, geode_id, True
+        return dataset, geode_id
 
     def get_array_values(self, array: Any, id_to_select: int) -> list[float] | float:
         components = array.GetNumberOfComponents()