From fd924d3212ef3d454777104eb430e6240c79bc57 Mon Sep 17 00:00:00 2001 From: ISA Date: Tue, 3 Sep 2024 09:49:52 +0200 Subject: [PATCH] die hooks Layer in den Verzeichnis /hooks/layers verschoben --- components/imports.js | 30 +++++++++---------- .../useCiscoRouterMarkersLayer.js | 6 ++-- hooks/{ => layers}/useDauzMarkersLayer.js | 4 +-- hooks/{ => layers}/useEciMarkersLayer.js | 7 +++-- hooks/{ => layers}/useGmaMarkersLayer.js | 5 ++-- hooks/{ => layers}/useGsmModemMarkersLayer.js | 6 ++-- .../useMessstellenMarkersLayer.js | 5 ++-- hooks/{ => layers}/useOtdrMarkersLayer.js | 4 +-- hooks/{ => layers}/useSiemensMarkersLayer.js | 6 ++-- .../useSmsfunkmodemMarkersLayer.js | 2 +- hooks/{ => layers}/useSonstigeMarkersLayer.js | 4 +-- hooks/{ => layers}/useTalasMarkers.js | 16 +++++----- hooks/{ => layers}/useTalasMarkersLayer.js | 6 ++-- hooks/{ => layers}/useTalasiclMarkersLayer.js | 4 +-- hooks/{ => layers}/useUlafMarkersLayer.js | 4 +-- hooks/{ => layers}/useWagoMarkersLayer.js | 6 ++-- hooks/{ => layers}/useWdmMarkersLayer.js | 4 +-- 17 files changed, 61 insertions(+), 58 deletions(-) rename hooks/{ => layers}/useCiscoRouterMarkersLayer.js (87%) rename hooks/{ => layers}/useDauzMarkersLayer.js (89%) rename hooks/{ => layers}/useEciMarkersLayer.js (84%) rename hooks/{ => layers}/useGmaMarkersLayer.js (94%) rename hooks/{ => layers}/useGsmModemMarkersLayer.js (87%) rename hooks/{ => layers}/useMessstellenMarkersLayer.js (84%) rename hooks/{ => layers}/useOtdrMarkersLayer.js (86%) rename hooks/{ => layers}/useSiemensMarkersLayer.js (86%) rename hooks/{ => layers}/useSmsfunkmodemMarkersLayer.js (95%) rename hooks/{ => layers}/useSonstigeMarkersLayer.js (90%) rename hooks/{ => layers}/useTalasMarkers.js (84%) rename hooks/{ => layers}/useTalasMarkersLayer.js (86%) rename hooks/{ => layers}/useTalasiclMarkersLayer.js (90%) rename hooks/{ => layers}/useUlafMarkersLayer.js (96%) rename hooks/{ => layers}/useWagoMarkersLayer.js (86%) rename hooks/{ => layers}/useWdmMarkersLayer.js (89%) diff --git a/components/imports.js b/components/imports.js index 3c1cb30e9..54a8ae187 100644 --- a/components/imports.js +++ b/components/imports.js @@ -40,21 +40,21 @@ import * as layers from "../config/layers.js"; import { zoomIn, zoomOut, centerHere } from "../utils/zoomAndCenterUtils.js"; import { initializeMap } from "../utils/mapInitialization.js"; import { addItemsToMapContextMenu } from "./useMapContextMenu.js"; -import useGmaMarkersLayer from "../hooks/useGmaMarkersLayer.js"; // Import the custom hook -import useTalasMarkersLayer from "../hooks/useTalasMarkersLayer.js"; // Import the custom hook -import useEciMarkersLayer from "../hooks/useEciMarkersLayer.js"; -import useGsmModemMarkersLayer from "../hooks/useGsmModemMarkersLayer.js"; -import useCiscoRouterMarkersLayer from "../hooks/useCiscoRouterMarkersLayer.js"; -import useWagoMarkersLayer from "../hooks/useWagoMarkersLayer.js"; -import useSiemensMarkersLayer from "../hooks/useSiemensMarkersLayer.js"; -import useOtdrMarkersLayer from "../hooks/useOtdrMarkersLayer.js"; -import useWdmMarkersLayer from "../hooks/useWdmMarkersLayer.js"; -import useMessstellenMarkersLayer from "../hooks/useMessstellenMarkersLayer.js"; -import useTalasiclMarkersLayer from "../hooks/useTalasiclMarkersLayer.js"; -import useDauzMarkersLayer from "../hooks/useDauzMarkersLayer.js"; -import useSmsfunkmodemMarkersLayer from "../hooks/useSmsfunkmodemMarkersLayer.js"; -import useUlafMarkersLayer from "../hooks/useUlafMarkersLayer.js"; -import useSonstigeMarkersLayer from "../hooks/useSonstigeMarkersLayer.js"; +import useGmaMarkersLayer from "../hooks/layers/useGmaMarkersLayer.js"; // Import the custom hook +import useTalasMarkersLayer from "../hooks/layers/useTalasMarkersLayer.js"; // Import the custom hook +import useEciMarkersLayer from "../hooks/layers/useEciMarkersLayer.js"; +import useGsmModemMarkersLayer from "../hooks/layers/useGsmModemMarkersLayer.js"; +import useCiscoRouterMarkersLayer from "../hooks/layers/useCiscoRouterMarkersLayer.js"; +import useWagoMarkersLayer from "../hooks/layers/useWagoMarkersLayer.js"; +import useSiemensMarkersLayer from "../hooks/layers/useSiemensMarkersLayer.js"; +import useOtdrMarkersLayer from "../hooks/layers/useOtdrMarkersLayer.js"; +import useWdmMarkersLayer from "../hooks/layers/useWdmMarkersLayer.js"; +import useMessstellenMarkersLayer from "../hooks/layers/useMessstellenMarkersLayer.js"; +import useTalasiclMarkersLayer from "../hooks/layers/useTalasiclMarkersLayer.js"; +import useDauzMarkersLayer from "../hooks/layers/useDauzMarkersLayer.js"; +import useSmsfunkmodemMarkersLayer from "../hooks/layers/useSmsfunkmodemMarkersLayer.js"; +import useUlafMarkersLayer from "../hooks/layers/useUlafMarkersLayer.js"; +import useSonstigeMarkersLayer from "../hooks/layers/useSonstigeMarkersLayer.js"; import handlePoiSelect from "../utils/handlePoiSelect.js"; import { fetchGisStationsStaticDistrict, fetchGisStationsStatusDistrict, fetchGisStationsMeasurements, fetchGisSystemStatic } from "../services/fetchData.js"; import { setupPolylines } from "../utils/setupPolylines.js"; diff --git a/hooks/useCiscoRouterMarkersLayer.js b/hooks/layers/useCiscoRouterMarkersLayer.js similarity index 87% rename from hooks/useCiscoRouterMarkersLayer.js rename to hooks/layers/useCiscoRouterMarkersLayer.js index 74e5a81c9..1f5447a2d 100644 --- a/hooks/useCiscoRouterMarkersLayer.js +++ b/hooks/layers/useCiscoRouterMarkersLayer.js @@ -1,9 +1,9 @@ // hooks/useCiscoRouterMarkersLayer.js import { useEffect, useState } from "react"; import L from "leaflet"; -import { createAndSetMarkers } from "../utils/markerUtils"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { checkOverlappingMarkers } from "../utils/mapUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { checkOverlappingMarkers } from "../../utils/mapUtils"; const useCiscoRouterMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [ciscoRouterMarkers, setCiscoRouterMarkers] = useState([]); diff --git a/hooks/useDauzMarkersLayer.js b/hooks/layers/useDauzMarkersLayer.js similarity index 89% rename from hooks/useDauzMarkersLayer.js rename to hooks/layers/useDauzMarkersLayer.js index 8ac18611e..e45bf7ecf 100644 --- a/hooks/useDauzMarkersLayer.js +++ b/hooks/layers/useDauzMarkersLayer.js @@ -1,8 +1,8 @@ // hooks/useDauzMarkersLayer.js import { useEffect, useState } from "react"; import L from "leaflet"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { createAndSetMarkers } from "../utils/markerUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; const useDauzMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [dauzMarkers, setDauzMarkers] = useState([]); diff --git a/hooks/useEciMarkersLayer.js b/hooks/layers/useEciMarkersLayer.js similarity index 84% rename from hooks/useEciMarkersLayer.js rename to hooks/layers/useEciMarkersLayer.js index c5b0535bb..40e4baed6 100644 --- a/hooks/useEciMarkersLayer.js +++ b/hooks/layers/useEciMarkersLayer.js @@ -1,8 +1,9 @@ +// /hooks/layers/useEciMarkersLayer.js import { useEffect, useState } from "react"; import L from "leaflet"; -import { createAndSetMarkers } from "../utils/markerUtils"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { checkOverlappingMarkers } from "../utils/mapUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { checkOverlappingMarkers } from "../../utils/mapUtils"; const useEciMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [eciMarkers, setEciMarkers] = useState([]); diff --git a/hooks/useGmaMarkersLayer.js b/hooks/layers/useGmaMarkersLayer.js similarity index 94% rename from hooks/useGmaMarkersLayer.js rename to hooks/layers/useGmaMarkersLayer.js index a95562b12..df6e0e00b 100644 --- a/hooks/useGmaMarkersLayer.js +++ b/hooks/layers/useGmaMarkersLayer.js @@ -1,5 +1,6 @@ +// /hooks/layers/useGmaMarkersLayer.js import { useEffect } from "react"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; const useGmaMarkersLayer = (map, gmaMarkers, GisStationsMeasurements, GMA, oms) => { useEffect(() => { @@ -44,7 +45,7 @@ const useGmaMarkersLayer = (map, gmaMarkers, GisStationsMeasurements, GMA, oms) permanent: true, direction: "auto", offset: [20, 0], - }, + } ); marker.on("mouseover", function () { diff --git a/hooks/useGsmModemMarkersLayer.js b/hooks/layers/useGsmModemMarkersLayer.js similarity index 87% rename from hooks/useGsmModemMarkersLayer.js rename to hooks/layers/useGsmModemMarkersLayer.js index 0b1a69fe3..adc4e9119 100644 --- a/hooks/useGsmModemMarkersLayer.js +++ b/hooks/layers/useGsmModemMarkersLayer.js @@ -1,9 +1,9 @@ // hooks/useGsmModemMarkersLayer.js import { useEffect, useState } from "react"; import L from "leaflet"; -import { createAndSetMarkers } from "../utils/markerUtils"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { checkOverlappingMarkers } from "../utils/mapUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { checkOverlappingMarkers } from "../../utils/mapUtils"; const useGsmModemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [gsmModemMarkers, setGsmModemMarkers] = useState([]); diff --git a/hooks/useMessstellenMarkersLayer.js b/hooks/layers/useMessstellenMarkersLayer.js similarity index 84% rename from hooks/useMessstellenMarkersLayer.js rename to hooks/layers/useMessstellenMarkersLayer.js index 447031824..381d7bd59 100644 --- a/hooks/useMessstellenMarkersLayer.js +++ b/hooks/layers/useMessstellenMarkersLayer.js @@ -1,7 +1,8 @@ +// /hooks/layers/useMessstellenMarkersLayer.js import { useEffect, useState } from "react"; import L from "leaflet"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { createAndSetMarkers } from "../utils/markerUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; const useMessstellenMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [messstellenMarkers, setMessstellenMarkers] = useState([]); diff --git a/hooks/useOtdrMarkersLayer.js b/hooks/layers/useOtdrMarkersLayer.js similarity index 86% rename from hooks/useOtdrMarkersLayer.js rename to hooks/layers/useOtdrMarkersLayer.js index 659eb1f09..0f56a13fa 100644 --- a/hooks/useOtdrMarkersLayer.js +++ b/hooks/layers/useOtdrMarkersLayer.js @@ -1,8 +1,8 @@ // hooks/useOtdrMarkersLayer.js 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 { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; // Assuming this function is in markerUtils const useOtdrMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [otdrMarkers, setOtdrMarkers] = useState([]); diff --git a/hooks/useSiemensMarkersLayer.js b/hooks/layers/useSiemensMarkersLayer.js similarity index 86% rename from hooks/useSiemensMarkersLayer.js rename to hooks/layers/useSiemensMarkersLayer.js index 292860373..39434eb4b 100644 --- a/hooks/useSiemensMarkersLayer.js +++ b/hooks/layers/useSiemensMarkersLayer.js @@ -1,9 +1,9 @@ // hooks/useSiemensMarkersLayer.js import { useState, useEffect } from "react"; import L from "leaflet"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { createAndSetMarkers } from "../utils/markerUtils"; -import { checkOverlappingMarkers } from "../utils/mapUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; +import { checkOverlappingMarkers } from "../../utils/mapUtils"; const useSiemensMarkersLayer = (map, oms, gisSystemStatic, priorityConfig) => { const [siemensMarkers, setSiemensMarkers] = useState([]); diff --git a/hooks/useSmsfunkmodemMarkersLayer.js b/hooks/layers/useSmsfunkmodemMarkersLayer.js similarity index 95% rename from hooks/useSmsfunkmodemMarkersLayer.js rename to hooks/layers/useSmsfunkmodemMarkersLayer.js index 0cead16b2..cc7aec7c5 100644 --- a/hooks/useSmsfunkmodemMarkersLayer.js +++ b/hooks/layers/useSmsfunkmodemMarkersLayer.js @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import L from "leaflet"; import "leaflet-contextmenu"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; const useSmsfunkmodemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [smsfunkmodemMarkers, setSmsfunkmodemMarkers] = useState([]); diff --git a/hooks/useSonstigeMarkersLayer.js b/hooks/layers/useSonstigeMarkersLayer.js similarity index 90% rename from hooks/useSonstigeMarkersLayer.js rename to hooks/layers/useSonstigeMarkersLayer.js index c41490c3a..6038dfe0b 100644 --- a/hooks/useSonstigeMarkersLayer.js +++ b/hooks/layers/useSonstigeMarkersLayer.js @@ -1,8 +1,8 @@ // hooks/useSonstigeMarkersLayer.js import { useEffect, useState } from "react"; import L from "leaflet"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { createAndSetMarkers } from "../utils/markerUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; const useSonstigeMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [sonstigeMarkers, setSonstigeMarkers] = useState([]); diff --git a/hooks/useTalasMarkers.js b/hooks/layers/useTalasMarkers.js similarity index 84% rename from hooks/useTalasMarkers.js rename to hooks/layers/useTalasMarkers.js index 0b0f9528d..e8ed7cd39 100644 --- a/hooks/useTalasMarkers.js +++ b/hooks/layers/useTalasMarkers.js @@ -3,13 +3,13 @@ import { useEffect, useState } from "react"; import L from "leaflet"; import "leaflet-contextmenu"; import { useRecoilValue } from "recoil"; -import { mapLayersState } from "../store/atoms/mapLayersState.js"; -import { selectedAreaState } from "../store/atoms/selectedAreaState.js"; -import { zoomTriggerState } from "../store/atoms/zoomTriggerState.js"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils.js"; -import { checkOverlappingMarkers } from "../utils/mapUtils.js"; -import plusRoundIcon from "../components/PlusRoundIcon.js"; -import { gisStationsStaticDistrictState } from "../store/atoms/gisStationState.js"; +import { mapLayersState } from "../../store/atoms/mapLayersState.js"; +import { selectedAreaState } from "../../store/atoms/selectedAreaState.js"; +import { zoomTriggerState } from "../../store/atoms/zoomTriggerState.js"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils.js"; +import { checkOverlappingMarkers } from "../../utils/mapUtils.js"; +import plusRoundIcon from "../../components/PlusRoundIcon.js"; +import { gisStationsStaticDistrictState } from "../../store/atoms/gisStationState.js"; const useTalasMarkers = (map, oms, layers, priorityConfig) => { const [talasMarkers, setTalasMarkers] = useState([]); @@ -36,7 +36,7 @@ const useTalasMarkers = (map, oms, layers, priorityConfig) => { iconSize: [25, 41], iconAnchor: [12, 41], popupAnchor: [1, -34], - }), + }) ); } diff --git a/hooks/useTalasMarkersLayer.js b/hooks/layers/useTalasMarkersLayer.js similarity index 86% rename from hooks/useTalasMarkersLayer.js rename to hooks/layers/useTalasMarkersLayer.js index 58798b1f1..7155fca5e 100644 --- a/hooks/useTalasMarkersLayer.js +++ b/hooks/layers/useTalasMarkersLayer.js @@ -1,8 +1,8 @@ import { useEffect, useState } from "react"; import L from "leaflet"; -import { createAndSetMarkers } from "../utils/markerUtils"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { checkOverlappingMarkers } from "../utils/mapUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { checkOverlappingMarkers } from "../../utils/mapUtils"; const useTalasMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [talasMarkers, setTalasMarkers] = useState([]); diff --git a/hooks/useTalasiclMarkersLayer.js b/hooks/layers/useTalasiclMarkersLayer.js similarity index 90% rename from hooks/useTalasiclMarkersLayer.js rename to hooks/layers/useTalasiclMarkersLayer.js index c0bb78ae8..5ca9d5c8d 100644 --- a/hooks/useTalasiclMarkersLayer.js +++ b/hooks/layers/useTalasiclMarkersLayer.js @@ -1,8 +1,8 @@ // hooks/useTalasiclMarkersLayer.js import { useEffect, useState } from "react"; import L from "leaflet"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { createAndSetMarkers } from "../utils/markerUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; const useTalasiclMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [talasiclMarkers, setTalasiclMarkers] = useState([]); diff --git a/hooks/useUlafMarkersLayer.js b/hooks/layers/useUlafMarkersLayer.js similarity index 96% rename from hooks/useUlafMarkersLayer.js rename to hooks/layers/useUlafMarkersLayer.js index 3cc9d0912..0499f0f4a 100644 --- a/hooks/useUlafMarkersLayer.js +++ b/hooks/layers/useUlafMarkersLayer.js @@ -1,7 +1,7 @@ // hooks/useUlafMarkersLayer.js import { useEffect, useState } from "react"; import L from "leaflet"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; //import { fetchDeviceNameById } from "../services/apiService"; const useUlafMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { @@ -51,7 +51,7 @@ const useUlafMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { ${deviceName}
${station.description || "Keine Beschreibung"} - `, + ` ) .openPopup(); }); diff --git a/hooks/useWagoMarkersLayer.js b/hooks/layers/useWagoMarkersLayer.js similarity index 86% rename from hooks/useWagoMarkersLayer.js rename to hooks/layers/useWagoMarkersLayer.js index 3b6bfad16..8fa56695b 100644 --- a/hooks/useWagoMarkersLayer.js +++ b/hooks/layers/useWagoMarkersLayer.js @@ -1,9 +1,9 @@ // hooks/useWagoMarkersLayer.js import { useState, useEffect } from "react"; import L from "leaflet"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { createAndSetMarkers } from "../utils/markerUtils"; -import { checkOverlappingMarkers } from "../utils/mapUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; +import { checkOverlappingMarkers } from "../../utils/mapUtils"; const useWagoMarkersLayer = (map, oms, gisSystemStatic, priorityConfig) => { const [wagoMarkers, setWagoMarkers] = useState([]); diff --git a/hooks/useWdmMarkersLayer.js b/hooks/layers/useWdmMarkersLayer.js similarity index 89% rename from hooks/useWdmMarkersLayer.js rename to hooks/layers/useWdmMarkersLayer.js index 1368c7a46..c2ed6ab51 100644 --- a/hooks/useWdmMarkersLayer.js +++ b/hooks/layers/useWdmMarkersLayer.js @@ -1,8 +1,8 @@ // hooks/useWdmMarkersLayer.js import { useEffect, useState } from "react"; import L from "leaflet"; -import { addContextMenuToMarker } from "../utils/contextMenuUtils"; -import { createAndSetMarkers } from "../utils/markerUtils"; +import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; +import { createAndSetMarkers } from "../../utils/markerUtils"; const useWdmMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const [wdmMarkers, setWdmMarkers] = useState([]);