@geops/rvf-mobility-web-component 0.1.97 → 0.1.99

package/package.json

@@ -2,7 +2,7 @@
   "name": "@geops/rvf-mobility-web-component",
   "license": "UNLICENSED",
   "description": "Web components for rvf in the domains of mobility and logistics.",
-  "version": "0.1.97",
+  "version": "0.1.99",
   "homepage": "https://rvf-mobility-web-component-geops.vercel.app/",
   "type": "module",
   "main": "index.js",

package/src/utils/applyInitialLayerVisibility.ts

@@ -14,9 +14,34 @@ const applyInitialLayerVisibility = (
     const names = layersAttrValue?.split(",") || [];
     const name = layer.get("name");
     const shouldBeVisible = names.includes(name);
-    // Visiblity of group are defined by their children, they should not appear in the permalink.
-    if (layer.getVisible() !== shouldBeVisible && !(layer as Group).getLayers) {
-      layer.setVisible(shouldBeVisible);
+    if (layer.getVisible() !== shouldBeVisible) {
+      // If the layer is a group we apply the visibility to its sublayers,
+      // not the group itself. Group should not appear in permalink layers param
+      if ((layer as Group).getLayers) {
+        (layer as Group)
+          .getLayers()
+          .getArray()
+          .forEach((subLayer) => {
+            applyInitialLayerVisibility(layersAttrValue, subLayer);
+          });
+      } else {
+        layer.setVisible(shouldBeVisible);
+      }
+    }
+  }
+
+  // if the layer is a group we set it to false if all its sublayers are false
+  if ((layer as Group).getLayers) {
+    if (
+      layer.getVisible() &&
+      !(layer as Group)
+        .getLayers()
+        ?.getArray()
+        .find((l) => {
+          return l.getVisible();
+        })
+    ) {
+      layer.setVisible(false);
     }
   }
 };

package/src/utils/hooks/useInitialLayersVisiblity.tsx

@@ -7,7 +7,7 @@ import applyInitialLayerVisibility from "../applyInitialLayerVisibility";
 import useInitialPermalink from "./useInitialPermalink";
 
 import type { Map } from "ol";
-// import type { Group } from "ol/layer";
+
 const useInitialLayersVisiblity = (
   map: Map,
   layers: string,
@@ -36,30 +36,14 @@ const useInitialLayersVisiblity = (
     }
 
     // We reverse the array to begin by the end of the tree (so the group layers are applied last)
-    const layersAsArray = getLayersAsFlatArray(map.getLayers().getArray());
+    const layersAsArray = getLayersAsFlatArray(
+      map.getLayers().getArray(),
+    ).reverse();
+
     layersAsArray.forEach((layer) => {
       applyInitialLayerVisibility(layersToUse, layer);
     });
 
-    // Hide group if there is no children visible
-    // layersAsArray
-    //   .filter((l) => {
-    //     return (l as Group).getLayers;
-    //   })
-    //   .forEach((layer) => {
-    //     if (
-    //       layer.getVisible() &&
-    //       !(layer as Group)
-    //         .getLayers()
-    //         ?.getArray()
-    //         .some((l) => {
-    //           return l.getVisible();
-    //         })
-    //     ) {
-    //       layer.setVisible(false);
-    //     }
-    //   });
-
     const key = map.getLayers().on("add", (event) => {
       applyInitialLayerVisibility(layersToUse, event.element);
     });