@geops/rvf-mobility-web-component 0.1.98 → 0.1.100

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.98",
+  "version": "0.1.100",
   "homepage": "https://rvf-mobility-web-component-geops.vercel.app/",
   "type": "module",
   "main": "index.js",

package/src/MobilityNotifications/MobilityNotifications.tsx

@@ -4,7 +4,6 @@ import { memo, useEffect, useMemo, useState } from "preact/compat";
 
 import I18n from "../I18n";
 import SituationDetails from "../SituationDetails";
-import useI18n from "../utils/hooks/useI18n";
 
 import MobilityNotificationsAttributes from "./MobilityNotificationsAttributes";
 
@@ -39,21 +38,15 @@ function MobilityNotifications({
   notificationurl,
 }: MobilityNotificationsProps) {
   const [situations, setSituations] = useState<SituationType[]>([]);
-  const { locale } = useI18n();
 
   // Define fallback languages from the notificationlang attribute
   const fallbackLangs = useMemo(() => {
     return (
-      notificationlang
-        ?.split(",")
-        .map((l) => {
-          return l.trim();
-        })
-        .filter((l) => {
-          return l !== locale();
-        }) || []
+      notificationlang?.split(",").map((l) => {
+        return l.trim();
+      }) || []
     );
-  }, [locale, notificationlang]);
+  }, [notificationlang]);
 
   useEffect(() => {
     new MocoAPI({

package/src/utils/applyInitialLayerVisibility.ts

@@ -15,27 +15,34 @@ const applyInitialLayerVisibility = (
     const name = layer.get("name");
     const shouldBeVisible = names.includes(name);
     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) => {
-            subLayer.setVisible(shouldBeVisible);
-            // applyInitialLayerVisibility(layersAttrValue, 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) {
-    (layer as Group)
-      .getLayers()
-      .getArray()
-      .forEach((subLayer) => {
-        // subLayer.setVisible(false);
-        applyInitialLayerVisibility(layersAttrValue, subLayer);
-      });
+    if (
+      layer.getVisible() &&
+      !(layer as Group)
+        .getLayers()
+        ?.getArray()
+        .find((l) => {
+          return l.getVisible();
+        })
+    ) {
+      layer.setVisible(false);
+    }
   }
 };
 export default applyInitialLayerVisibility;

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,
@@ -39,29 +39,11 @@ const useInitialLayersVisiblity = (
     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);
     });