From c5d4ed3a591c8afb27d456a7cea2cba23ac69ef6 Mon Sep 17 00:00:00 2001
From: ISA <Ismail.ali@littwin-systemtechnik.de>
Date: Wed, 14 May 2025 08:03:34 +0200
Subject: [PATCH] fix: LTEModam nicht klickbar

---
 components/mainComponent/MapComponent.js |  2 +-
 config/appVersion.js                     |  2 +-
 hooks/layers/useLteModemMarkersLayer.js  | 10 +++++-----
 hooks/useLayerVisibility.js              | 15 +++++++++++++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js
index 529a7d6ac..936760503 100644
--- a/components/mainComponent/MapComponent.js
+++ b/components/mainComponent/MapComponent.js
@@ -681,7 +681,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   useLayerVisibility(map, eciMarkers, mapLayersVisibility, "ECI", oms);
   useLayerVisibility(map, lteModemMarkers, mapLayersVisibility, "LTEModem", oms);
   useLayerVisibility(map, ciscoRouterMarkers, mapLayersVisibility, "CiscoRouter", oms);
-  useLayerVisibility(map, lteModemMarkers, mapLayersVisibility, "LTEModem", oms);
+  //useLayerVisibility(map, lteModemMarkers, mapLayersVisibility, "LTEModem", oms);
   useLayerVisibility(map, wagoMarkers, mapLayersVisibility, "WAGO", oms);
   useLayerVisibility(map, siemensMarkers, mapLayersVisibility, "Siemens", oms);
   useLayerVisibility(map, otdrMarkers, mapLayersVisibility, "OTDR", oms);
diff --git a/config/appVersion.js b/config/appVersion.js
index dfc217a82..d81f02fa4 100644
--- a/config/appVersion.js
+++ b/config/appVersion.js
@@ -1,2 +1,2 @@
 // /config/appVersion
-export const APP_VERSION = "1.1.59";
+export const APP_VERSION = "1.1.60";
diff --git a/hooks/layers/useLteModemMarkersLayer.js b/hooks/layers/useLteModemMarkersLayer.js
index 38c0b6c0a..8c4d82cd7 100644
--- a/hooks/layers/useLteModemMarkersLayer.js
+++ b/hooks/layers/useLteModemMarkersLayer.js
@@ -10,13 +10,13 @@ const useLteModemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
 
   useEffect(() => {
     if (GisSystemStatic && GisSystemStatic.length && map) {
-      createAndSetDevices(5, setGsmModemMarkers, GisSystemStatic, priorityConfig); // GSM-Modem
+      createAndSetDevices(5, setLteModemMarkers, GisSystemStatic, priorityConfig); // GSM-Modem
     }
   }, [GisSystemStatic, map, priorityConfig]);
 
   useEffect(() => {
-    if (map && gsmModemMarkers.length) {
-      gsmModemMarkers.forEach((marker) => {
+    if (map && lteModemMarkers.length) {
+      lteModemMarkers.forEach((marker) => {
         marker.addTo(map);
         oms.addMarker(marker);
 
@@ -40,8 +40,8 @@ const useLteModemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
       // Call the function to check for overlapping markers
       checkOverlappingMarkers(oms, map);
     }
-  }, [map, gsmModemMarkers]);
+  }, [map, lteModemMarkers]);
 
-  return gsmModemMarkers;
+  return lteModemMarkers;
 };
 export default useLteModemMarkersLayer;
diff --git a/hooks/useLayerVisibility.js b/hooks/useLayerVisibility.js
index 0f1f2236c..b8f22c354 100644
--- a/hooks/useLayerVisibility.js
+++ b/hooks/useLayerVisibility.js
@@ -6,12 +6,23 @@ const useLayerVisibility = (map, markers, mapLayersVisibility, layerKey, oms) =>
   useEffect(() => {
     if (!map || !markers || !oms) return;
 
+    // Leerzeichen, Bindestriche entfernen & Kleinbuchstaben erzwingen
+    const normalizedLayerKey = layerKey.replace(/\s|-/g, "").toLowerCase();
+
+    // Alle mapLayersVisibility-Keys auch normalisieren
+    const visibilityKeys = Object.keys(mapLayersVisibility).reduce((acc, key) => {
+      acc[key.replace(/\s|-/g, "").toLowerCase()] = mapLayersVisibility[key];
+      return acc;
+    }, {});
+
+    const isVisible = visibilityKeys[normalizedLayerKey] ?? false;
+
     const toggleLayer = (isVisible) => {
       markers.forEach((marker) => {
         if (isVisible) {
           marker.addTo(map);
           oms.addMarker(marker);
-          addContextMenuToMarker(marker); // Kontextmenü hinzufügen
+          addContextMenuToMarker(marker);
         } else {
           map.removeLayer(marker);
           oms.removeMarker(marker);
@@ -19,7 +30,7 @@ const useLayerVisibility = (map, markers, mapLayersVisibility, layerKey, oms) =>
       });
     };
 
-    toggleLayer(mapLayersVisibility[layerKey]);
+    toggleLayer(isVisible);
   }, [map, markers, mapLayersVisibility, layerKey, oms]);
 };