From 90345e24cd099968cad7b4d1e045c4511972e940 Mon Sep 17 00:00:00 2001 From: ISA Date: Tue, 20 May 2025 09:58:32 +0200 Subject: [PATCH] refactor: useInitGisStationsStatusDistrict entfernt, direkter Redux-Dispatch in MapComponent --- components/mainComponent/MapComponent.js | 15 +++++++++------ .../useInitGisStationsStaticDistrict.js | 12 ------------ .../useInitGisStationsStatusDistrict.js | 12 ------------ config/appVersion.js | 2 +- 4 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 components/mainComponent/hooks/webServices/useInitGisStationsStaticDistrict.js delete mode 100644 components/mainComponent/hooks/webServices/useInitGisStationsStatusDistrict.js diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index 782277b2b..af92f5cfb 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -40,16 +40,14 @@ import { fetchPoiData } from "../../services/api/fetchPoiData.js"; import { fetchGisStationsMeasurements } from "../../services/api/fetchGisStationsMeasurements.js"; import { selectPolylineVisible, setPolylineVisible } from "../../redux/slices/polylineLayerVisibleSlice.js"; import { useInitLocationDevices } from "./hooks/webServices/useInitLocationDevices"; -import { useInitGisStationsStaticDistrict } from "./hooks/webServices/useInitGisStationsStaticDistrict"; +import { fetchGisStationsStaticDistrictFromWebService } from "../../redux/slices/webService/gisStationsStaticDistrictSlice"; import { selectGisStationsStaticDistrict } from "../../redux/slices/webService/gisStationsStaticDistrictSlice"; -import { useInitGisStationsStatusDistrict } from "./hooks/webServices/useInitGisStationsStatusDistrict"; +import { fetchGisStationsStatusDistrictFromWebService } from "../../redux/slices/webService/gisStationsStatusDistrictSlice"; import { fetchGisStationsMeasurementsFromWebService } from "../../redux/slices/webService/gisStationsMeasurementsSlice"; import { useInitGisSystemStatic } from "./hooks/webServices/useInitGisSystemStatic"; import { selectGisSystemStatic, setGisSystemStatic } from "../../redux/slices/webService/gisSystemStaticSlice"; import ShowAddStationPopup from "../AddPOIModal.js"; - import { fetchGisStationsStatic } from "../../redux/slices/webService/gisStationsStaticSlice"; - import AddPOIOnPolyline from "../AddPOIOnPolyline"; import { enablePolylineEvents, disablePolylineEvents } from "../../utils/polylines/eventHandlers"; import { updateCountdown, closePolylineContextMenu } from "../../redux/slices/polylineContextMenuSlice"; @@ -876,8 +874,13 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { //---------------------------------------------- // speichere location devices in redux store useInitLocationDevices(); - useInitGisStationsStaticDistrict(); - useInitGisStationsStatusDistrict(); + useEffect(() => { + dispatch(fetchGisStationsStaticDistrictFromWebService()); + }, [dispatch]); + + useEffect(() => { + dispatch(fetchGisStationsStatusDistrictFromWebService()); + }, [dispatch]); useEffect(() => { dispatch(fetchGisStationsMeasurementsFromWebService()); }, [dispatch]); diff --git a/components/mainComponent/hooks/webServices/useInitGisStationsStaticDistrict.js b/components/mainComponent/hooks/webServices/useInitGisStationsStaticDistrict.js deleted file mode 100644 index 74d70c736..000000000 --- a/components/mainComponent/hooks/webServices/useInitGisStationsStaticDistrict.js +++ /dev/null @@ -1,12 +0,0 @@ -// /components/mainComponent/hooks/useInitGisStationsStaticDistrict.js -import { useEffect } from "react"; -import { useDispatch } from "react-redux"; -import { fetchGisStationsStaticDistrictFromWebService } from "../../../../redux/slices/webService/gisStationsStaticDistrictSlice"; - -export const useInitGisStationsStaticDistrict = () => { - const dispatch = useDispatch(); - - useEffect(() => { - dispatch(fetchGisStationsStaticDistrictFromWebService()); - }, [dispatch]); -}; diff --git a/components/mainComponent/hooks/webServices/useInitGisStationsStatusDistrict.js b/components/mainComponent/hooks/webServices/useInitGisStationsStatusDistrict.js deleted file mode 100644 index 147b1fa31..000000000 --- a/components/mainComponent/hooks/webServices/useInitGisStationsStatusDistrict.js +++ /dev/null @@ -1,12 +0,0 @@ -// /componets/mainComponent/hooks/useInitGisStationsStatusDistrict.js -import { useEffect } from "react"; -import { useDispatch } from "react-redux"; -import { fetchGisStationsStatusDistrictFromWebService } from "../../../../redux/slices/webService/gisStationsStatusDistrictSlice"; - -export const useInitGisStationsStatusDistrict = () => { - const dispatch = useDispatch(); - - useEffect(() => { - dispatch(fetchGisStationsStatusDistrictFromWebService()); - }, [dispatch]); -}; diff --git a/config/appVersion.js b/config/appVersion.js index 4ef2e26e8..25788f5f0 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.111"; +export const APP_VERSION = "1.1.112";