Ismail/nodeMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: LTEModam nicht klickbar

Browse Source
This commit is contained in:
ISA
2025-05-14 08:03:34 +02:00
parent 154d310117
commit c5d4ed3a59
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/mainComponent/MapComponent.js
View File

@@ -681,7 +681,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
useLayerVisibility(map, eciMarkers, mapLayersVisibility, "ECI", oms); useLayerVisibility(map, eciMarkers, mapLayersVisibility, "ECI", oms);
useLayerVisibility(map, lteModemMarkers, mapLayersVisibility, "LTEModem", oms); useLayerVisibility(map, lteModemMarkers, mapLayersVisibility, "LTEModem", oms);
useLayerVisibility(map, ciscoRouterMarkers, mapLayersVisibility, "CiscoRouter", 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, wagoMarkers, mapLayersVisibility, "WAGO", oms);
useLayerVisibility(map, siemensMarkers, mapLayersVisibility, "Siemens", oms); useLayerVisibility(map, siemensMarkers, mapLayersVisibility, "Siemens", oms);
useLayerVisibility(map, otdrMarkers, mapLayersVisibility, "OTDR", oms); useLayerVisibility(map, otdrMarkers, mapLayersVisibility, "OTDR", oms);

2
config/appVersion.js
View File

@@ -1,2 +1,2 @@
// /config/appVersion // /config/appVersion
export const APP_VERSION = "1.1.59"; export const APP_VERSION = "1.1.60";

10
hooks/layers/useLteModemMarkersLayer.js
View File

@@ -10,13 +10,13 @@ const useLteModemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
useEffect(() => { useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) { if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetDevices(5, setGsmModemMarkers, GisSystemStatic, priorityConfig); // GSM-Modem createAndSetDevices(5, setLteModemMarkers, GisSystemStatic, priorityConfig); // GSM-Modem
} }
}, [GisSystemStatic, map, priorityConfig]); }, [GisSystemStatic, map, priorityConfig]);
useEffect(() => { useEffect(() => {
if (map && gsmModemMarkers.length) { if (map && lteModemMarkers.length) {
gsmModemMarkers.forEach((marker) => { lteModemMarkers.forEach((marker) => {
marker.addTo(map); marker.addTo(map);
oms.addMarker(marker); oms.addMarker(marker);
@@ -40,8 +40,8 @@ const useLteModemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
// Call the function to check for overlapping markers // Call the function to check for overlapping markers
checkOverlappingMarkers(oms, map); checkOverlappingMarkers(oms, map);
} }
}, [map, gsmModemMarkers]); }, [map, lteModemMarkers]);
return gsmModemMarkers; return lteModemMarkers;
}; };
export default useLteModemMarkersLayer; export default useLteModemMarkersLayer;

15
hooks/useLayerVisibility.js
View File

@@ -6,12 +6,23 @@ const useLayerVisibility = (map, markers, mapLayersVisibility, layerKey, oms) =>
useEffect(() => { useEffect(() => {
if (!map || !markers || !oms) return; 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) => { const toggleLayer = (isVisible) => {
markers.forEach((marker) => { markers.forEach((marker) => {
if (isVisible) { if (isVisible) {
marker.addTo(map); marker.addTo(map);
oms.addMarker(marker); oms.addMarker(marker);
addContextMenuToMarker(marker); // Kontextmenü hinzufügen addContextMenuToMarker(marker);
} else { } else {
map.removeLayer(marker); map.removeLayer(marker);
oms.removeMarker(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]); }, [map, markers, mapLayersVisibility, layerKey, oms]);
}; };