Leerzeichen von Systemnamen entfernen damit einblenen und ausblenden von der jenige layergroups Markers

This commit is contained in:
ISA
2024-04-29 11:17:39 +02:00
parent 8f4552c259
commit 4e4755dad4
3 changed files with 44 additions and 21 deletions

View File

@@ -168,6 +168,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
fetchData();
}, []); // Dependency-Array ist leer, um den Effekt nur beim Mount auszuführen
//------------------------------------------
//GisSystemStatic Daten laden
useEffect(() => {
const fetchData = async () => {
@@ -1194,13 +1195,18 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
toggleLayer(mapLayersVisibility.TALAS);
}, [map, talasMarkers, mapLayersVisibility.TALAS]); */ // Depend on map, markers array, and visibility state
const handleCheckboxChange = (event) => {
const handleCheckboxChange = (name, event) => {
const { checked } = event.target;
setMapLayersVisibility((prev) => ({
...prev,
TALAS: checked,
}));
const internalName = layerNames[name] || name; // Nutzt den internen Namen, wenn vorhanden, sonst den originalen Namen
setMapLayersVisibility((prev) => {
return {
...prev,
[internalName]: checked,
};
});
};
//------------------------------------------
// Funktion zum Ein- und Ausblenden der TALAS-Marker basierend auf dem Zustand von mapLayersVisibility.TALAS
@@ -1270,6 +1276,12 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
}, [map, gsmModemMarkers, mapLayersVisibility.GSMModem]);
//------------------------------------------ */
const layerNames = {
"GSM Modem": "GSMMODEM",
"Cisco Router": "CiscoRouter",
"TALAS ICL": "TALASICL",
"SMS-Funkmodem": "GSMModem",
};
//------------------------------------------ */
// Funktion zum Ein- und Ausblenden der CiscoRouter-Marker basierend auf dem Zustand von mapLayersVisibility.CiscoRouter
@@ -1277,14 +1289,16 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
if (!map || !ciscoRouterMarkers) return;
const toggleLayer = (isVisible) => {
if (isVisible) {
ciscoRouterMarkers.forEach((marker) => marker.addTo(map)); // Ensure markers are added
ciscoRouterMarkers.forEach((marker) => marker.addTo(map));
} else {
ciscoRouterMarkers.forEach((marker) => map.removeLayer(marker)); // Remove markers individually
ciscoRouterMarkers.forEach((marker) => map.removeLayer(marker));
}
};
// Apply visibility
toggleLayer(mapLayersVisibility.CiscoRouter);
}, [map, ciscoRouterMarkers, mapLayersVisibility.CiscoRouter]);
// Nutzt die Map, um den internen Namen zu bekommen
const internalName = layerNames["Cisco Router"] || "CiscoRouter";
toggleLayer(mapLayersVisibility[internalName]);
console.log("internalName Cisco Router: ", internalName);
}, [map, ciscoRouterMarkers, mapLayersVisibility]);
//------------------------------------------ */
//------------------------------------------ */
@@ -1395,6 +1409,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
useEffect(() => {
if (!map || !talasiclMarkers) return;
console.log("talasiclMarkers", talasiclMarkers);
const toggleLayer = (isVisible) => {
if (isVisible) {
talasiclMarkers.forEach((marker) => marker.addTo(map)); // Ensure markers are added
@@ -1402,9 +1417,13 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
talasiclMarkers.forEach((marker) => map.removeLayer(marker)); // Remove markers individually
}
};
// Apply visibility
toggleLayer(mapLayersVisibility.TALASICL);
}, [map, talasiclMarkers, mapLayersVisibility.TALASICL]);
// Verwendung der Map, um den internen Namen zu bekommen, und Fallback auf "TALASICL", falls nicht gefunden
const internalName =
layerNames["TALAS ICL"] || "TALASICL || talasiclMarkers ";
toggleLayer(mapLayersVisibility[internalName]);
console.log("internalName for TALAS ICL in MapComponent: ", internalName);
}, [map, talasiclMarkers, mapLayersVisibility]);
//------------------------------------------ */
//------------------------------------------ */