createAndSetMarkers in createAndSetDevices umbenennt

This commit is contained in:
ISA
2024-09-03 10:39:35 +02:00
parent 8c4a99fc34
commit 0c4df186c2
17 changed files with 127 additions and 45 deletions

View File

@@ -1,7 +1,7 @@
// hooks/useCiscoRouterMarkersLayer.js
import { useEffect, useState } from "react";
import L from "leaflet";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { checkOverlappingMarkers } from "../../utils/mapUtils";
@@ -10,7 +10,7 @@ const useCiscoRouterMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) =
useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetMarkers(6, setCiscoRouterMarkers, GisSystemStatic, priorityConfig); // Cisco Router
createAndSetDevices(6, setCiscoRouterMarkers, GisSystemStatic, priorityConfig); // Cisco Router
}
}, [GisSystemStatic, map, priorityConfig]);

View File

@@ -2,14 +2,14 @@
import { useEffect, useState } from "react";
import L from "leaflet";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
const useDauzMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
const [dauzMarkers, setDauzMarkers] = useState([]);
useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetMarkers(110, setDauzMarkers, GisSystemStatic, priorityConfig); // DAUZ
createAndSetDevices(110, setDauzMarkers, GisSystemStatic, priorityConfig); // DAUZ
}
}, [GisSystemStatic, map, priorityConfig]);

View File

@@ -1,7 +1,7 @@
// /hooks/layers/useEciMarkersLayer.js
import { useEffect, useState } from "react";
import L from "leaflet";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { checkOverlappingMarkers } from "../../utils/mapUtils";
@@ -10,7 +10,7 @@ const useEciMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetMarkers(2, setEciMarkers, GisSystemStatic, priorityConfig); // ECI-System
createAndSetDevices(2, setEciMarkers, GisSystemStatic, priorityConfig); // ECI-System
}
}, [GisSystemStatic, map, priorityConfig]);

View File

@@ -1,7 +1,7 @@
// hooks/useGsmModemMarkersLayer.js
import { useEffect, useState } from "react";
import L from "leaflet";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { checkOverlappingMarkers } from "../../utils/mapUtils";
@@ -10,7 +10,7 @@ const useGsmModemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetMarkers(5, setGsmModemMarkers, GisSystemStatic, priorityConfig); // GSM-Modem
createAndSetDevices(5, setGsmModemMarkers, GisSystemStatic, priorityConfig); // GSM-Modem
}
}, [GisSystemStatic, map, priorityConfig]);

View File

@@ -2,14 +2,14 @@
import { useEffect, useState } from "react";
import L from "leaflet";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
const useMessstellenMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
const [messstellenMarkers, setMessstellenMarkers] = useState([]);
useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetMarkers(13, setMessstellenMarkers, GisSystemStatic, priorityConfig); // Messstellen
createAndSetDevices(13, setMessstellenMarkers, GisSystemStatic, priorityConfig); // Messstellen
}
}, [GisSystemStatic, map, priorityConfig]);

View File

@@ -2,14 +2,14 @@
import { useEffect, useState } from "react";
import L from "leaflet";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { createAndSetMarkers } from "../../utils/markerUtils"; // Assuming this function is in markerUtils
import { createAndSetDevices } from "../../utils/markerUtils"; // Assuming this function is in markerUtils
const useOtdrMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
const [otdrMarkers, setOtdrMarkers] = useState([]);
useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetMarkers(9, setOtdrMarkers, GisSystemStatic, priorityConfig); // OTDR
createAndSetDevices(9, setOtdrMarkers, GisSystemStatic, priorityConfig); // OTDR
}
}, [GisSystemStatic, map, priorityConfig]);

View File

@@ -2,7 +2,7 @@
import { useState, useEffect } from "react";
import L from "leaflet";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
import { checkOverlappingMarkers } from "../../utils/mapUtils";
const useSiemensMarkersLayer = (map, oms, gisSystemStatic, priorityConfig) => {
@@ -10,7 +10,7 @@ const useSiemensMarkersLayer = (map, oms, gisSystemStatic, priorityConfig) => {
useEffect(() => {
if (gisSystemStatic && gisSystemStatic.length && map) {
createAndSetMarkers(8, setSiemensMarkers, gisSystemStatic, priorityConfig); // Siemens-System
createAndSetDevices(8, setSiemensMarkers, gisSystemStatic, priorityConfig); // Siemens-System
}
}, [gisSystemStatic, map, priorityConfig]);

View File

@@ -2,14 +2,14 @@
import { useEffect, useState } from "react";
import L from "leaflet";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
const useSonstigeMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
const [sonstigeMarkers, setSonstigeMarkers] = useState([]);
useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetMarkers(200, setSonstigeMarkers, GisSystemStatic, priorityConfig); // Sonstige
createAndSetDevices(200, setSonstigeMarkers, GisSystemStatic, priorityConfig); // Sonstige
}
}, [GisSystemStatic, map, priorityConfig]);

View File

@@ -19,7 +19,7 @@ const useTalasMarkers = (map, oms, layers, priorityConfig) => {
const GisStationsStaticDistrict = useRecoilValue(gisStationsStaticDistrictState);
// Funktion zum Erstellen und Setzen der Marker
const createAndSetMarkers = (systemId, setMarkers, GisSystemStatic, priorityConfig) => {
const createAndSetDevices = (systemId, setMarkers, GisSystemStatic, priorityConfig) => {
const markers = GisSystemStatic.filter((station) => station.System === systemId).map((station) => {
const marker = L.marker([station.Latitude, station.Longitude], {
title: station.Name,
@@ -96,7 +96,7 @@ const useTalasMarkers = (map, oms, layers, priorityConfig) => {
}
}, [zoomTrigger, map]);
return [talasMarkers, setTalasMarkers, createAndSetMarkers];
return [talasMarkers, setTalasMarkers, createAndSetDevices];
};
export default useTalasMarkers;

View File

@@ -1,6 +1,6 @@
import { useEffect, useState } from "react";
import L from "leaflet";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { checkOverlappingMarkers } from "../../utils/mapUtils";
@@ -9,7 +9,7 @@ const useTalasMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetMarkers(1, setTalasMarkers, GisSystemStatic, priorityConfig); // TALAS-System
createAndSetDevices(1, setTalasMarkers, GisSystemStatic, priorityConfig); // TALAS-System
}
}, [GisSystemStatic, map, priorityConfig]);

View File

@@ -2,14 +2,14 @@
import { useEffect, useState } from "react";
import L from "leaflet";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
const useTalasiclMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
const [talasiclMarkers, setTalasiclMarkers] = useState([]);
useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetMarkers(100, setTalasiclMarkers, GisSystemStatic, priorityConfig); // TALASICL
createAndSetDevices(100, setTalasiclMarkers, GisSystemStatic, priorityConfig); // TALASICL
}
}, [GisSystemStatic, map, priorityConfig]);

View File

@@ -2,7 +2,7 @@
import { useState, useEffect } from "react";
import L from "leaflet";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
import { checkOverlappingMarkers } from "../../utils/mapUtils";
const useWagoMarkersLayer = (map, oms, gisSystemStatic, priorityConfig) => {
@@ -10,7 +10,7 @@ const useWagoMarkersLayer = (map, oms, gisSystemStatic, priorityConfig) => {
useEffect(() => {
if (gisSystemStatic && gisSystemStatic.length && map) {
createAndSetMarkers(7, setWagoMarkers, gisSystemStatic, priorityConfig); // WAGO-System
createAndSetDevices(7, setWagoMarkers, gisSystemStatic, priorityConfig); // WAGO-System
}
}, [gisSystemStatic, map, priorityConfig]);

View File

@@ -2,14 +2,14 @@
import { useEffect, useState } from "react";
import L from "leaflet";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { createAndSetMarkers } from "../../utils/markerUtils";
import { createAndSetDevices } from "../../utils/markerUtils";
const useWdmMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
const [wdmMarkers, setWdmMarkers] = useState([]);
useEffect(() => {
if (GisSystemStatic && GisSystemStatic.length && map) {
createAndSetMarkers(10, setWdmMarkers, GisSystemStatic, priorityConfig); // WDM
createAndSetDevices(10, setWdmMarkers, GisSystemStatic, priorityConfig); // WDM
}
}, [GisSystemStatic, map, priorityConfig]);