LTE-Modem statt GSM-Modem, das sind das selbe gemeint

components/MapComponent.js

@@ -3,22 +3,17 @@ import React, { useEffect, useRef, useState, useCallback } from "react";
 import L from "leaflet";
 import "leaflet/dist/leaflet.css";
 import "leaflet-contextmenu/dist/leaflet.contextmenu.css";
-
 import "leaflet-contextmenu";
 import * as config from "../config/config.js";
 import "leaflet.smooth_marker_bouncing";
-import OverlappingMarkerSpiderfier from "overlapping-marker-spiderfier-leaflet";
+import OverlappingMarkerSpiderfier from "overlapping-marker-spiderfier-leaflet"; //sieht deaktiviert aber ist das nicht so und wird benötigt
+import "react-toastify/dist/ReactToastify.css";
 import DataSheet from "./DataSheet.js";
 import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
-
 import AddPoiModalWindow from "./pois/AddPoiModalWindow.js";
-
 import { InformationCircleIcon } from "@heroicons/react/20/solid";
 import PoiUpdateModal from "./pois/PoiUpdateModal.js";
-
 import { ToastContainer, toast } from "react-toastify";
-import "react-toastify/dist/ReactToastify.css";
-
 import plusRoundIcon from "./PlusRoundIcon.js";
 import { createAndSetDevices } from "../utils/createAndSetDevices.js";
 import { restoreMapSettings, checkOverlappingMarkers } from "../utils/mapUtils.js";
@@ -46,7 +41,7 @@ import { disablePolylineEvents, enablePolylineEvents } from "../utils/setupPolyl
 import { updateLocation } from "../utils/updateBereichUtil";
 import { initGeocoderFeature } from "../components/features/GeocoderFeature";
 //--------------------------------------------
-import { currentPoiState } from "../redux/slices/currentPoiSlice.js";
+//import { currentPoiState } from "../redux/slices/currentPoiSlice.js";
 import { selectGisStationsStaticDistrict, setGisStationsStaticDistrict } from "../redux/slices/gisStationsStaticDistrictSlice";
 import { mapIdState, userIdState } from "../redux/slices/urlParameterSlice.js";
 import { poiLayerVisibleState } from "../redux/slices/poiLayerVisibleSlice.js";
@@ -133,7 +128,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   const [gmaMarkers, setGmaMarkers] = useState([]); //--------------------station.System === 11 alle sind untetschiedlich Nummern
   const [talasMarkers, setTalasMarkers] = useState([]);
   const [eciMarkers, setEciMarkers] = useState([]);
-  const [gsmModemMarkers, setGsmModemMarkers] = useState([]);
+  const [lteModemMarkers, setlteModemMarkers] = useState([]);
   const [ciscoRouterMarkers, setCiscoRouterMarkers] = useState([]);
   const [wagoMarkers, setWagoMarkers] = useState([]);
   const [siemensMarkers, setSiemensMarkers] = useState([]);
@@ -147,8 +142,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   const [sonstigeMarkers, setSonstigeMarkers] = useState([]);
   const [tkComponentsMarkers, setTkComponentsMarkers] = useState([]);
 
-  const [lteModemMarkers, setLteModemMarkers] = useState([]);
-
   const [lineStatusData, setLineStatusData] = useState([]);
   const [linesData, setLinesData] = useState([]);
   const mapLayersVisibility = useRecoilValue(mapLayersState);
@@ -408,7 +401,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
 
   useLayerVisibility(map, talasMarkers, mapLayersVisibility, "TALAS", oms);
   useLayerVisibility(map, eciMarkers, mapLayersVisibility, "ECI", oms);
-  useLayerVisibility(map, gsmModemMarkers, mapLayersVisibility, "LTEModem", oms);
+  useLayerVisibility(map, lteModemMarkers, mapLayersVisibility, "LTEModem", oms);
   useLayerVisibility(map, ciscoRouterMarkers, mapLayersVisibility, "CiscoRouter", oms);
   useLayerVisibility(map, lteModemMarkers, mapLayersVisibility, "LTEModem", oms);
 
@@ -442,7 +435,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   const allMarkers = [
     ...talasMarkers,
     ...eciMarkers,
-    ...gsmModemMarkers,
+    ...lteModemMarkers,
     ...ciscoRouterMarkers,
     ...wagoMarkers,
     ...siemensMarkers,
@@ -487,7 +480,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
     map,
     talasMarkers,
     eciMarkers,
-    gsmModemMarkers,
+    lteModemMarkers,
     ciscoRouterMarkers,
     wagoMarkers,
     siemensMarkers,
@@ -749,7 +742,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   const gmaLayerRef = useRef(null);
   const talasLayerRef = useRef(null);
   const eciMarkersLayerRef = useRef(null);
-  const gsmModemMarkersLayerRef = useRef(null);
+  const lteModemMarkersLayerRef = useRef(null);
   const ciscoRouterMarkersLayerRef = useRef(null);
   const wagoMarkersLayerRef = useRef(null);
   const siemensMarkersLayerRef = useRef(null);
@@ -769,7 +762,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
       { ref: gmaLayerRef, id: 11, setState: setGmaMarkers },
       { ref: talasLayerRef, id: 1, setState: setTalasMarkers },
       { ref: eciMarkersLayerRef, id: 2, setState: setEciMarkers },
-      { ref: gsmModemMarkersLayerRef, id: 5, setState: setGsmModemMarkers },
+      { ref: lteModemMarkersLayerRef, id: 5, setState: setlteModemMarkers },
       { ref: ciscoRouterMarkersLayerRef, id: 6, setState: setCiscoRouterMarkers },
       { ref: wagoMarkersLayerRef, id: 7, setState: setWagoMarkers },
       { ref: siemensMarkersLayerRef, id: 8, setState: setSiemensMarkers },

hooks/layers/useLteModemMarkersLayer.js

@@ -1,12 +1,12 @@
-// hooks/useGsmModemMarkersLayer.js
+// hooks/useLteModemMarkersLayer.js
 import { useEffect, useState } from "react";
 import L from "leaflet";
 import { createAndSetDevices } from "../../utils/createAndSetDevices";
 import { addContextMenuToMarker } from "../../utils/addContextMenuToMarker";
 import { checkOverlappingMarkers } from "../../utils/mapUtils";
 
-const useGsmModemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
+const useLteModemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
-  const [gsmModemMarkers, setGsmModemMarkers] = useState([]);
+  const [lteModemMarkers, setLteModemMarkers] = useState([]);
 
   useEffect(() => {
     if (GisSystemStatic && GisSystemStatic.length && map) {
@@ -44,4 +44,4 @@ const useGsmModemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
 
   return gsmModemMarkers;
 };
-export default useGsmModemMarkersLayer;
+export default useLteModemMarkersLayer;