From 03a1f480e05e694d9b3129a58ef0d7c1600f36b6 Mon Sep 17 00:00:00 2001 From: ISA Date: Mon, 26 May 2025 11:12:45 +0200 Subject: [PATCH] refactor --- components/mainComponent/MapComponent.js | 10 +-- components/pois/AddPOIModal.js | 2 +- .../MapLayersControlPanel.js | 4 +- config/appVersion.js | 2 +- hooks/useMapComponentState.js | 81 +++++++++---------- pages/index.js | 2 +- .../database/locationDevicesFromDBSlice.js | 1 + .../pois}/addPoiOnPolylineSlice.js | 1 + .../{ => database/pois}/currentPoiSlice.js | 2 +- .../pois}/poiLayerVisibleSlice.js | 2 +- .../pois}/poiReadFromDbTriggerSlice.js | 2 +- .../pois}/readPoiMarkersStoreSlice.js | 2 +- .../{ => database/pois}/selectedPoiSlice.js | 2 +- .../polylines}/polylineContextMenuSlice.js | 2 +- .../polylines}/polylineEventsDisabledSlice.js | 2 +- .../polylines}/polylineLayerVisibleSlice.js | 3 +- redux/store.js | 45 ++++++----- services/database/pois/fetchPoiTypService.js | 2 +- utils/polylines/setupPolylines.js | 4 +- utils/setupPOIs.js | 2 +- 20 files changed, 87 insertions(+), 86 deletions(-) rename redux/slices/{ => database/pois}/addPoiOnPolylineSlice.js (91%) rename redux/slices/{ => database/pois}/currentPoiSlice.js (93%) rename redux/slices/{ => database/pois}/poiLayerVisibleSlice.js (89%) rename redux/slices/{ => database/pois}/poiReadFromDbTriggerSlice.js (88%) rename redux/slices/{ => database/pois}/readPoiMarkersStoreSlice.js (89%) rename redux/slices/{ => database/pois}/selectedPoiSlice.js (89%) rename redux/slices/{ => database/polylines}/polylineContextMenuSlice.js (96%) rename redux/slices/{ => database/polylines}/polylineEventsDisabledSlice.js (88%) rename redux/slices/{ => database/polylines}/polylineLayerVisibleSlice.js (86%) diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index ae6d64860..8baef9963 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -39,12 +39,12 @@ import useInitializeMap from "./hooks/useInitializeMap"; //-------------------Redux-------------------- import { useSelector, useDispatch } from "react-redux"; //-------------------Redux-Slices-------------------- -import { setSelectedPoi } from "../../redux/slices/selectedPoiSlice"; -import { setDisabled } from "../../redux/slices/polylineEventsDisabledSlice"; +import { setSelectedPoi } from "../../redux/slices/database/pois/selectedPoiSlice.js"; +import { setDisabled } from "../../redux/slices/database/polylines/polylineEventsDisabledSlice.js"; import { setMapId, setUserId } from "../../redux/slices/urlParameterSlice"; import { fetchPoiTypes } from "../../redux/slices/database/pois/poiTypesSlice.js"; import { selectMapLayersState } from "../../redux/slices/mapLayersSlice"; -import { setCurrentPoi } from "../../redux/slices/currentPoiSlice.js"; +import { setCurrentPoi } from "../../redux/slices/database/pois/currentPoiSlice.js"; import { selectGisLines } from "../../redux/slices/database/polylines/gisLinesSlice"; import { selectGisLinesStatus } from "../../redux/slices/webservice/gisLinesStatusSlice"; import { selectPoiTypData, selectPoiTypStatus } from "../../redux/slices/database/pois/poiTypSlice"; @@ -52,8 +52,8 @@ import { selectPriorityConfig } from "../../redux/slices/database/priorityConfig import { selectPoiIconsData, selectPoiIconsStatus } from "../../redux/slices/database/pois/poiIconsDataSlice"; import { selectGisLinesStatusFromWebservice } from "../../redux/slices/webservice/gisLinesStatusSlice"; import { selectGisUserRightsFromWebservice } from "../../redux/slices/webservice/userRightsSlice"; -import { updateCountdown, closePolylineContextMenu } from "../../redux/slices/polylineContextMenuSlice"; -import { selectPolylineVisible, setPolylineVisible } from "../../redux/slices/polylineLayerVisibleSlice.js"; +import { updateCountdown, closePolylineContextMenu } from "../../redux/slices/database/polylines/polylineContextMenuSlice.js"; +import { selectPolylineVisible, setPolylineVisible } from "../../redux/slices/database/polylines/polylineLayerVisibleSlice.js"; import { selectGisStationsStaticDistrict } from "../../redux/slices/webservice/gisStationsStaticDistrictSlice.js"; import { selectGisSystemStatic, setGisSystemStatic } from "../../redux/slices/webservice/gisSystemStaticSlice.js"; //-----------Redux-Thunks------------------- diff --git a/components/pois/AddPOIModal.js b/components/pois/AddPOIModal.js index b974cb7d8..c75bc78be 100644 --- a/components/pois/AddPOIModal.js +++ b/components/pois/AddPOIModal.js @@ -3,7 +3,7 @@ import React, { useState, useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; import { selectGisStationsStaticDistrict } from "../../redux/slices/webservice/gisStationsStaticDistrictSlice"; import { fetchPoiTypes } from "../../redux/slices/database/pois/poiTypesSlice"; -import { incrementTrigger } from "../../redux/slices/poiReadFromDbTriggerSlice"; +import { incrementTrigger } from "../../redux/slices/database/pois/poiReadFromDbTriggerSlice"; import { addPoiThunk } from "../../redux/thunks/database/pois/addPoiThunk"; import { fetchPoiIconsDataThunk } from "../../redux/thunks/database/pois/fetchPoiIconsDataThunk"; diff --git a/components/uiWidgets/mapLayersControlPanel/MapLayersControlPanel.js b/components/uiWidgets/mapLayersControlPanel/MapLayersControlPanel.js index f3dca149f..d5dfb7cca 100644 --- a/components/uiWidgets/mapLayersControlPanel/MapLayersControlPanel.js +++ b/components/uiWidgets/mapLayersControlPanel/MapLayersControlPanel.js @@ -3,11 +3,11 @@ import React, { useEffect, useState } from "react"; import { setSelectedArea } from "../../../redux/slices/selectedAreaSlice"; import EditModeToggle from "./EditModeToggle"; import { useSelector, useDispatch } from "react-redux"; -import { selectPolylineVisible, setPolylineVisible } from "../../../redux/slices/polylineLayerVisibleSlice"; +import { selectPolylineVisible, setPolylineVisible } from "../../../redux/slices/database/polylines/polylineLayerVisibleSlice"; import { selectGisSystemStatic } from "../../../redux/slices/webservice/gisSystemStaticSlice"; import { selectGisStationsStaticDistrict } from "../../../redux/slices/webservice/gisStationsStaticDistrictSlice"; import { selectMapLayersState, setLayerVisibility } from "../../../redux/slices/mapLayersSlice"; -import { setVisible } from "../../../redux/slices/poiLayerVisibleSlice"; +import { setVisible } from "../../../redux/slices/database/pois/poiLayerVisibleSlice"; import { incrementZoomTrigger } from "../../../redux/slices/zoomTriggerSlice"; function MapLayersControlPanel() { diff --git a/config/appVersion.js b/config/appVersion.js index c7db329c2..5cee9959b 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.172"; +export const APP_VERSION = "1.1.173"; diff --git a/hooks/useMapComponentState.js b/hooks/useMapComponentState.js index b70d1a19f..d33c7c378 100644 --- a/hooks/useMapComponentState.js +++ b/hooks/useMapComponentState.js @@ -1,52 +1,48 @@ // /hooks/useMapComponentState.js -// POI -> Kontextmenü -> POI bearbeiten -> Dropdown Geräteauswahl -import { useState, useEffect } from "react"; -import { useSelector } from "react-redux"; +import { useEffect, useState } from "react"; +import { useDispatch, useSelector } from "react-redux"; +import { fetchPoiTypThunk } from "../redux/thunks/database/pois/fetchPoiTypThunk"; +import { selectPoiTypData, selectPoiTypStatus } from "../redux/slices/database/pois/poiTypSlice"; +import { selectPoiLayerVisible } from "../redux/slices/database/pois/poiLayerVisibleSlice"; export const useMapComponentState = () => { - const [poiTypData, setPoiTypData] = useState([]); - const [isPoiTypLoaded, setIsPoiTypLoaded] = useState(false); - const [deviceName, setDeviceName] = useState(""); - const [locationDeviceData, setLocationDeviceData] = useState([]); - const [priorityConfig, setPriorityConfig] = useState([]); - const [menuItemAdded, setMenuItemAdded] = useState(false); + const dispatch = useDispatch(); - // ✅ Redux: Zustand der Sichtbarkeit des POI-Layers + // Redux: POI-Typen + const poiTypData = useSelector(selectPoiTypData); + const poiTypStatus = useSelector(selectPoiTypStatus); + + // Redux: Sichtbarkeit des POI-Layers const poiLayerVisible = useSelector((state) => state.poiLayerVisible.visible); + // Lokaler State: Geräte und Kontextmenü + const [deviceName, setDeviceName] = useState(""); + const [locationDeviceData, setLocationDeviceData] = useState([]); + const [priorityConfig, setPriorityConfig] = useState([]); // TODO: Redux + const [menuItemAdded, setMenuItemAdded] = useState(false); + + // Optional: Nur im Mock-Modus POI-Typen lokal setzen useEffect(() => { - const fetchPoiTypData = async () => { - if (process.env.NEXT_PUBLIC_USE_MOCK_API === "true") { - console.log("⚠️ Mock-API: POI Typen geladen (Mock)"); - - const mockData = [ - { idPoiTyp: 1, name: "Mock Zähleranschlusskasten", icon: 4, onlySystemTyp: 0 }, - { idPoiTyp: 2, name: "Mock Geräteschrank", icon: 2, onlySystemTyp: 0 }, - { idPoiTyp: 4, name: "Mock Parkplatz", icon: 3, onlySystemTyp: 0 }, - { idPoiTyp: 6, name: "Mock Zufahrt", icon: 4, onlySystemTyp: 0 }, - { idPoiTyp: 20, name: "Mock Zählgerät", icon: 5, onlySystemTyp: 110 }, - { idPoiTyp: 21, name: "Mock Messschleife", icon: 6, onlySystemTyp: 110 }, - { idPoiTyp: 25, name: "Mock Sonstige", icon: 0, onlySystemTyp: 0 }, - { idPoiTyp: 33, name: "Mock Autobahnauffahrt", icon: 4, onlySystemTyp: null }, - ]; - - setPoiTypData(mockData); - setIsPoiTypLoaded(true); - return; - } - - try { - const response = await fetch("/api/talas_v5_DB/poiTyp/readPoiTyp"); - const data = await response.json(); - setPoiTypData(data); - setIsPoiTypLoaded(true); - } catch (error) { - console.error("❌ Fehler beim Abrufen der POI-Typen:", error); - setPoiTypData([]); - setIsPoiTypLoaded(true); - } - }; + if (process.env.NEXT_PUBLIC_USE_MOCK_API === "true") { + const mockData = [ + { idPoiTyp: 1, name: "Mock Zähleranschlusskasten", icon: 4, onlySystemTyp: 0 }, + { idPoiTyp: 2, name: "Mock Geräteschrank", icon: 2, onlySystemTyp: 0 }, + { idPoiTyp: 4, name: "Mock Parkplatz", icon: 3, onlySystemTyp: 0 }, + { idPoiTyp: 6, name: "Mock Zufahrt", icon: 4, onlySystemTyp: 0 }, + { idPoiTyp: 20, name: "Mock Zählgerät", icon: 5, onlySystemTyp: 110 }, + { idPoiTyp: 21, name: "Mock Messschleife", icon: 6, onlySystemTyp: 110 }, + { idPoiTyp: 25, name: "Mock Sonstige", icon: 0, onlySystemTyp: 0 }, + { idPoiTyp: 33, name: "Mock Autobahnauffahrt", icon: 4, onlySystemTyp: null }, + ]; + // Du kannst das Redux-Mock-Datenhandling später noch global regeln + console.warn("⚠️ POI-Typen im Mock-Modus geladen."); + } else if (poiTypStatus === "idle") { + dispatch(fetchPoiTypThunk()); + } + }, [dispatch, poiTypStatus]); + // Geräte-Daten lokal laden (kann später durch fetchLocationDevicesThunk ersetzt werden) + useEffect(() => { const fetchDeviceData = async () => { try { const protocol = window.location.protocol; @@ -71,13 +67,12 @@ export const useMapComponentState = () => { } }; - fetchPoiTypData(); fetchDeviceData(); }, []); return { poiTypData, - isPoiTypLoaded, + isPoiTypLoaded: poiTypStatus === "succeeded", deviceName, setDeviceName, locationDeviceData, diff --git a/pages/index.js b/pages/index.js index a213a9e7d..4a3391863 100644 --- a/pages/index.js +++ b/pages/index.js @@ -1,7 +1,7 @@ "use client"; import React, { useEffect, useState } from "react"; import dynamic from "next/dynamic"; -import { setPoiMarkers } from "../redux/slices/readPoiMarkersStoreSlice.js"; +import { setPoiMarkers } from "../redux/slices/database/pois/readPoiMarkersStoreSlice.js"; import { useSelector, useDispatch } from "react-redux"; const MapComponentWithNoSSR = dynamic(() => import("../components/mainComponent/MapComponent"), { ssr: false }); diff --git a/redux/slices/database/locationDevicesFromDBSlice.js b/redux/slices/database/locationDevicesFromDBSlice.js index 75fcf2675..8136a9ad5 100644 --- a/redux/slices/database/locationDevicesFromDBSlice.js +++ b/redux/slices/database/locationDevicesFromDBSlice.js @@ -1,3 +1,4 @@ +// /redux/slices/database/locationDevicesFromDBSlice.js import { createSlice } from "@reduxjs/toolkit"; import { fetchLocationDevicesThunk } from "../../thunks/database/fetchLocationDevicesThunk"; diff --git a/redux/slices/addPoiOnPolylineSlice.js b/redux/slices/database/pois/addPoiOnPolylineSlice.js similarity index 91% rename from redux/slices/addPoiOnPolylineSlice.js rename to redux/slices/database/pois/addPoiOnPolylineSlice.js index 567ce9bb0..5a760b010 100644 --- a/redux/slices/addPoiOnPolylineSlice.js +++ b/redux/slices/database/pois/addPoiOnPolylineSlice.js @@ -1,3 +1,4 @@ +// /redux/slices/database/pois/addPoiOnPolylineSlice.js import { createSlice } from "@reduxjs/toolkit"; const initialState = { diff --git a/redux/slices/currentPoiSlice.js b/redux/slices/database/pois/currentPoiSlice.js similarity index 93% rename from redux/slices/currentPoiSlice.js rename to redux/slices/database/pois/currentPoiSlice.js index 7b4998621..e8aaf3bf8 100644 --- a/redux/slices/currentPoiSlice.js +++ b/redux/slices/database/pois/currentPoiSlice.js @@ -1,4 +1,4 @@ -// /redux/slices/currentPoiSlice.js +// /redux/slices/database/pois/currentPoiSlice.js import { createSlice } from "@reduxjs/toolkit"; const initialState = { diff --git a/redux/slices/poiLayerVisibleSlice.js b/redux/slices/database/pois/poiLayerVisibleSlice.js similarity index 89% rename from redux/slices/poiLayerVisibleSlice.js rename to redux/slices/database/pois/poiLayerVisibleSlice.js index 9efb2a4a3..46fef3ab6 100644 --- a/redux/slices/poiLayerVisibleSlice.js +++ b/redux/slices/database/pois/poiLayerVisibleSlice.js @@ -1,4 +1,4 @@ -// /redux/slices/poiLayerVisibleSlice.js +// /redux/slices/database/pois/poiLayerVisibleSlice.js import { createSlice } from "@reduxjs/toolkit"; const initialState = { diff --git a/redux/slices/poiReadFromDbTriggerSlice.js b/redux/slices/database/pois/poiReadFromDbTriggerSlice.js similarity index 88% rename from redux/slices/poiReadFromDbTriggerSlice.js rename to redux/slices/database/pois/poiReadFromDbTriggerSlice.js index cbac3c6bc..76e3bc897 100644 --- a/redux/slices/poiReadFromDbTriggerSlice.js +++ b/redux/slices/database/pois/poiReadFromDbTriggerSlice.js @@ -1,4 +1,4 @@ -// redux/slices/poiReadFromDbTriggerSlice.js +// redux/slices/database/pois/poiReadFromDbTriggerSlice.js import { createSlice } from "@reduxjs/toolkit"; const initialState = { diff --git a/redux/slices/readPoiMarkersStoreSlice.js b/redux/slices/database/pois/readPoiMarkersStoreSlice.js similarity index 89% rename from redux/slices/readPoiMarkersStoreSlice.js rename to redux/slices/database/pois/readPoiMarkersStoreSlice.js index 13631449c..f46cf3ded 100644 --- a/redux/slices/readPoiMarkersStoreSlice.js +++ b/redux/slices/database/pois/readPoiMarkersStoreSlice.js @@ -1,4 +1,4 @@ -// redux/slices/readPoiMarkersStoreSlice.js +// redux/slices/database/pois/readPoiMarkersStoreSlice.js import { createSlice } from "@reduxjs/toolkit"; const initialState = { diff --git a/redux/slices/selectedPoiSlice.js b/redux/slices/database/pois/selectedPoiSlice.js similarity index 89% rename from redux/slices/selectedPoiSlice.js rename to redux/slices/database/pois/selectedPoiSlice.js index 776b1e716..39dd4adf0 100644 --- a/redux/slices/selectedPoiSlice.js +++ b/redux/slices/database/pois/selectedPoiSlice.js @@ -1,4 +1,4 @@ -// redux/slices/selectedPoiSlice.js +// redux/slices/database/pois/selectedPoiSlice.js import { createSlice } from "@reduxjs/toolkit"; export const selectedPoiSlice = createSlice({ diff --git a/redux/slices/polylineContextMenuSlice.js b/redux/slices/database/polylines/polylineContextMenuSlice.js similarity index 96% rename from redux/slices/polylineContextMenuSlice.js rename to redux/slices/database/polylines/polylineContextMenuSlice.js index 9735f7088..8598e9eae 100644 --- a/redux/slices/polylineContextMenuSlice.js +++ b/redux/slices/database/polylines/polylineContextMenuSlice.js @@ -1,4 +1,4 @@ -// redux/slices/polylineContextMenuSlice.js +// redux/slices/database/polylines/polylineContextMenuSlice.js import { createSlice } from "@reduxjs/toolkit"; const initialState = { diff --git a/redux/slices/polylineEventsDisabledSlice.js b/redux/slices/database/polylines/polylineEventsDisabledSlice.js similarity index 88% rename from redux/slices/polylineEventsDisabledSlice.js rename to redux/slices/database/polylines/polylineEventsDisabledSlice.js index 0d12372c8..aff11a930 100644 --- a/redux/slices/polylineEventsDisabledSlice.js +++ b/redux/slices/database/polylines/polylineEventsDisabledSlice.js @@ -1,4 +1,4 @@ -// redux/slices/polylineEventsDisabledSlice.js +// redux/slices/database/polylines/polylineEventsDisabledSlice.js import { createSlice } from "@reduxjs/toolkit"; const initialState = { diff --git a/redux/slices/polylineLayerVisibleSlice.js b/redux/slices/database/polylines/polylineLayerVisibleSlice.js similarity index 86% rename from redux/slices/polylineLayerVisibleSlice.js rename to redux/slices/database/polylines/polylineLayerVisibleSlice.js index 973f58b82..92b222a97 100644 --- a/redux/slices/polylineLayerVisibleSlice.js +++ b/redux/slices/database/polylines/polylineLayerVisibleSlice.js @@ -1,5 +1,4 @@ -// /redux/slices/polylineLayerVisibleSlice.js -// redux/slices/polylineLayerVisibleSlice.js +// /redux/slices/database7polylines/polylineLayerVisibleSlice.js import { createSlice } from "@reduxjs/toolkit"; const initialState = { diff --git a/redux/store.js b/redux/store.js index 43772807f..164cc0f94 100644 --- a/redux/store.js +++ b/redux/store.js @@ -1,28 +1,23 @@ // /redux/store.js import { configureStore } from "@reduxjs/toolkit"; -import lineVisibilityReducer from "./slices/lineVisibilitySlice"; -import currentPoiReducer from "./slices/currentPoiSlice"; -import polylineLayerVisibleReducer from "./slices/polylineLayerVisibleSlice"; -import addPoiOnPolylineReducer from "./slices/addPoiOnPolylineSlice"; -import polylineContextMenuReducer from "./slices/polylineContextMenuSlice"; -import selectedPoiReducer from "./slices/selectedPoiSlice"; -import selectedDeviceReducer from "./slices/selectedDeviceSlice"; -import mapLayersReducer from "./slices/mapLayersSlice"; -import poiLayerVisibleReducer from "./slices/poiLayerVisibleSlice"; -import poiReadFromDbTriggerReducer from "./slices/poiReadFromDbTriggerSlice"; -import polylineEventsDisabledReducer from "./slices/polylineEventsDisabledSlice"; -import readPoiMarkersStoreReducer from "./slices/readPoiMarkersStoreSlice"; -import selectedAreaReducer from "./slices/selectedAreaSlice"; -import zoomTriggerReducer from "./slices/zoomTriggerSlice"; -import urlParameterReducer from "./slices/urlParameterSlice"; -//-----database------------ -import priorityConfigReducer from "./slices/database/priorityConfigSlice"; +//-----database--------------------------------------------------- +//--pois------------ import poiTypesReducer from "./slices/database/pois/poiTypesSlice"; -import locationDevicesFromDBReducer from "./slices/database/locationDevicesFromDBSlice"; -import gisLinesFromDatabaseReducer from "./slices/database/polylines/gisLinesSlice"; import poiTypReducer from "./slices/database/pois/poiTypSlice"; import poiIconsDataReducer from "./slices/database/pois/poiIconsDataSlice"; -//----webservice------------ +import poiLayerVisibleReducer from "./slices/database/pois/poiLayerVisibleSlice"; +import addPoiOnPolylineReducer from "./slices/database/pois/addPoiOnPolylineSlice"; +import selectedPoiReducer from "./slices/database/pois/selectedPoiSlice"; +import currentPoiReducer from "./slices/database/pois/currentPoiSlice"; +import poiReadFromDbTriggerReducer from "./slices/database/pois/poiReadFromDbTriggerSlice"; +import readPoiMarkersStoreReducer from "./slices/database/pois/readPoiMarkersStoreSlice"; +//--polylines------------ +import gisLinesFromDatabaseReducer from "./slices/database/polylines/gisLinesSlice"; +import polylineLayerVisibleReducer from "./slices/database/polylines/polylineLayerVisibleSlice"; +import polylineContextMenuReducer from "./slices/database/polylines/polylineContextMenuSlice"; +import polylineEventsDisabledReducer from "./slices/database/polylines/polylineEventsDisabledSlice"; + +//----webservice--------------------------------------------------------------- import gisStationsStaticDistrictReducer from "./slices/webservice/gisStationsStaticDistrictSlice"; import gisStationsStatusDistrictReducer from "./slices/webservice/gisStationsStatusDistrictSlice"; import gisStationsMeasurementsReducer from "./slices/webservice/gisStationsMeasurementsSlice"; @@ -30,6 +25,16 @@ import gisSystemStaticReducer from "./slices/webservice/gisSystemStaticSlice"; import userRightsReducer from "./slices/webservice/userRightsSlice"; import gisLinesStatusFromWebserviceReducer from "./slices/webservice/gisLinesStatusSlice"; import addPoiReducer from "./slices/database/pois/addPoiSlice"; +//----------------- +import mapLayersReducer from "./slices/mapLayersSlice"; +import priorityConfigReducer from "./slices/database/priorityConfigSlice"; +import locationDevicesFromDBReducer from "./slices/database/locationDevicesFromDBSlice"; +import lineVisibilityReducer from "./slices/lineVisibilitySlice"; +import selectedDeviceReducer from "./slices/selectedDeviceSlice"; +import selectedAreaReducer from "./slices/selectedAreaSlice"; +import zoomTriggerReducer from "./slices/zoomTriggerSlice"; +import urlParameterReducer from "./slices/urlParameterSlice"; +//---------------- export const store = configureStore({ reducer: { diff --git a/services/database/pois/fetchPoiTypService.js b/services/database/pois/fetchPoiTypService.js index 10efbc21b..cd44e8f4c 100644 --- a/services/database/pois/fetchPoiTypService.js +++ b/services/database/pois/fetchPoiTypService.js @@ -1,4 +1,4 @@ -// /services/database/fetchPoiTypService.js +// /services/database/pois/fetchPoiTypService.js export const fetchPoiTypService = async () => { const res = await fetch(`${window.location.origin}/api/talas_v5_DB/poiTyp/readPoiTyp`); if (!res.ok) throw new Error("Fehler beim Abrufen der POI-Typen"); diff --git a/utils/polylines/setupPolylines.js b/utils/polylines/setupPolylines.js index 9ebff3329..25f07a335 100644 --- a/utils/polylines/setupPolylines.js +++ b/utils/polylines/setupPolylines.js @@ -7,9 +7,9 @@ import endIcon from "../../components/gisPolylines/icons/EndIcon"; import { redrawPolyline } from "./redrawPolyline"; import { toast } from "react-toastify"; import { store } from "../../redux/store"; // Importiere den Store -import { openPolylineContextMenu, closePolylineContextMenu } from "../../redux/slices/polylineContextMenuSlice"; +import { openPolylineContextMenu, closePolylineContextMenu } from "../../redux/slices/database/polylines/polylineContextMenuSlice"; import { monitorContextMenu } from "./monitorContextMenu"; -import { forceCloseContextMenu } from "../../redux/slices/polylineContextMenuSlice"; +import { forceCloseContextMenu } from "../../redux/slices/database/polylines/polylineContextMenuSlice"; //-------------------------------------------- export const setupPolylines = (map, linePositions, lineColors, tooltipContents, setNewCoords, tempMarker, currentZoom, currentCenter, polylineVisible) => { diff --git a/utils/setupPOIs.js b/utils/setupPOIs.js index 92b7a3d56..19993c1fa 100644 --- a/utils/setupPOIs.js +++ b/utils/setupPOIs.js @@ -2,7 +2,7 @@ import { parsePoint } from "./geometryUtils"; import { handleEditPoi } from "./poiUtils"; import { updateLocationInDatabaseService } from "../services/database/updateLocationInDatabaseService"; -import { setSelectedPoi, clearSelectedPoi } from "../redux/slices/selectedPoiSlice"; +import { setSelectedPoi, clearSelectedPoi } from "../redux/slices/database/pois/selectedPoiSlice"; export const setupPOIs = async ( map,