refactor: alle Services strukturiert und vereinheitlicht (v1.1.120) – Webservice/Database getrennt, Postfix 'Service' eingeführt

components/mainComponent/MapComponent.js

@@ -37,7 +37,6 @@ import CoordinateModal from "../CoordinateModal.js";
 import CoordinatePopup from "../CoordinatePopup.js";
 //------------------------Daten aus API--------------------
 import { fetchPoiDataService } from "../../services/database/fetchPoiDataService.js";
-import { fetchGisStationsMeasurementsService } from "../../services/webservice/fetchGisStationsMeasurementsService.js";
 import { selectPolylineVisible, setPolylineVisible } from "../../redux/slices/polylineLayerVisibleSlice.js";
 import { fetchLocationDevicesFromDB } from "../../redux/slices/db/locationDevicesFromDBSlice";
 import { fetchGisStationsStaticDistrictFromWebService } from "../../redux/slices/webService/gisStationsStaticDistrictSlice";
@@ -54,7 +53,6 @@ import { updateCountdown, closePolylineContextMenu } from "../../redux/slices/po
 //-------------------MapComponent.js hooks--------------------
 import useInitializeMap from "./hooks/useInitializeMap";
 import useLoadUserRights from "./hooks/useLoadUserRights";
-import useFetchWebServiceMap from "./hooks/useFetchWebServiceMap";
 import useFetchPoiData from "./hooks/useFetchPoiData.js";
 import useRestoreMapSettings from "./hooks/useRestoreMapSettings";
 import { setSelectedPoi } from "../../redux/slices/selectedPoiSlice";
@@ -95,7 +93,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   const [currentPoiData, setCurrentPoiData] = useState(null);
   const [showVersionInfoModal, setShowVersionInfoModal] = useState(false);
   const zoomTrigger = useSelector((state) => state.zoomTrigger.trigger);
-  const [gisSystemStaticLoaded, setGisSystemStaticLoaded] = useState(false);
+
   const [poiTypMap, setPoiTypMap] = useState(new Map());
   const [showPopup, setShowPopup] = useState(false);
   const poiReadTrigger = useSelector((state) => state.poiReadFromDbTrigger.trigger);
@@ -104,13 +102,11 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   const [map, setMap] = useState(null); // Zustand der Karteninstanz
   const [oms, setOms] = useState(null); // State für OMS-Instanz
   const GisStationsStaticDistrict = useSelector(selectGisStationsStaticDistrict);
-  const [GisStationsStatusDistrict, setGisStationsStatusDistrict] = useState([]); // Zustand für Statusdaten
   const [GisStationsMeasurements, setGisStationsMeasurements] = useState([]); // Zustand für Messdaten
   const GisSystemStatic = useSelector(selectGisSystemStatic);
+  const gisSystemStaticStatus = useSelector((state) => state.gisSystemStatic.status);
   // Konstanten für die URLs
-  const mapGisStationsStatusDistrictUrl = config.mapGisStationsStatusDistrictUrl;
   const mapGisStationsMeasurementsUrl = config.mapGisStationsMeasurementsUrl;
-  const mapGisSystemStaticUrl = config.mapGisSystemStaticUrl;
   const webserviceGisLinesStatusUrl = config.webserviceGisLinesStatusUrl;
   //console.log("priorityConfig in MapComponent1: ", priorityConfig);
   //-----------------------------------------
@@ -146,10 +142,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   const [showCoordinatesModal, setShowCoordinatesModal] = useState(false);
   const [popupCoordinates, setPopupCoordinates] = useState(null);
   const [popupVisible, setPopupVisible] = useState(false);
-  const handleAddStation = (stationData) => {
-    setAddPoiModalWindowState(false);
-    closePopup(); // Schließt das Popup nach dem Hinzufügen
-  };
+
   const openVersionInfoModal = () => {
     setShowVersionInfoModal(true);
   };
@@ -188,7 +181,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
     ...tkComponentsMarkers,
     ...ulafMarkers,
   ];
-  const useMock = process.env.NEXT_PUBLIC_USE_MOCK_API === "true";
   //--------------------------------------------
   const gmaLayerRef = useRef(null);
   const talasLayerRef = useRef(null);
@@ -214,7 +206,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
     dispatch(setUserId(params.get("u")));
   }, [dispatch]);
   //---------------------------------------------------------------
-  useFetchWebServiceMap(mapGisStationsStatusDistrictUrl, mapGisStationsMeasurementsUrl, mapGisSystemStaticUrl, setGisStationsStatusDistrict, setGisStationsMeasurements, setGisSystemStatic, setGisSystemStaticLoaded);
+
   //--------------------------------------------------------
   useEffect(() => {
     const endpoint = "/api/talas_v5_DB/gisLines/readGisLines";
@@ -296,9 +288,9 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   //---------------------------------------------
   //console.log("priorityConfig in MapComponent2: ", priorityConfig);
   useEffect(() => {
-    if (gisSystemStaticLoaded && map) {
+    if (map) {
     }
-  }, [gisSystemStaticLoaded, map, GisSystemStatic, priorityConfig]);
+  }, [map, GisSystemStatic, priorityConfig]);
   //--------------------------------------------
   useEffect(() => {
     if (map) {
@@ -655,7 +647,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
   useLayerVisibility(map, ulafMarkers, mapLayersVisibility, "ULAF", oms);
   //--------------------------------------------
   useEffect(() => {
-    if (!gisSystemStaticLoaded || !map) return; // Sicherstellen, dass die Karte und Daten geladen sind
+    if (gisSystemStaticStatus !== "succeeded" || !map) return;
 
     const layerGroups = [
       { ref: gmaLayerRef, id: 11, setState: setGmaMarkers },
@@ -740,7 +732,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
         }
       });
     };
-  }, [gisSystemStaticLoaded, map, GisSystemStatic, priorityConfig]);
+  }, [map, GisSystemStatic, priorityConfig]);
 
   //---------------------------------------
   // Initialisiere Leaflet-Karte

components/mainComponent/hooks/useFetchWebServiceMap.js

@@ -1,52 +0,0 @@
-// /components/mainComponent/hooks/useFetchWebServiceMap.js
-import { useEffect } from "react";
-import { fetchGisStationsStatusDistrictService } from "../../../services/webservice/fetchGisStationsStatusDistrictService";
-import { fetchGisStationsMeasurementsService } from "../../../services/webservice/fetchGisStationsMeasurementsService";
-import { fetchGisSystemStaticService } from "../../../services/webservice/fetchGisSystemStaticService";
-
-const useFetchWebServiceMap = (mapGisStationsStatusDistrictUrl, mapGisStationsMeasurementsUrl, mapGisSystemStaticUrl, setGisStationsStatusDistrict, setGisStationsMeasurements, setGisSystemStatic, setGisSystemStaticLoaded) => {
-  useEffect(() => {
-    //console.log("✅ useFetchWebServiceMap wurde ausgeführt!");
-
-    const fetchWebServiceMap = async () => {
-      try {
-        let requestCount = localStorage.getItem("fetchWebServiceMap") || 0;
-        requestCount = parseInt(requestCount, 10);
-
-        console.log("📡 Starte API-Anfragen...");
-
-        const fetchOptions = {
-          method: "GET",
-          headers: { Connection: "close" },
-        };
-
-        // GIS Stations Status District abrufen
-        //console.log("⏳ Abrufen von GIS Stations Status District...");
-        await fetchGisStationsStatusDistrictService(mapGisStationsStatusDistrictUrl, setGisStationsStatusDistrict, fetchOptions);
-        // console.log("✅ fetchGisStationsStatusDistrictService erfolgreich!");
-        requestCount++;
-        localStorage.setItem("fetchWebServiceMap", requestCount);
-
-        // GIS Stations Measurements abrufen
-        //console.log("⏳ Abrufen von GIS Stations Measurements...");
-        await fetchGisStationsMeasurementsService(mapGisStationsMeasurementsUrl, setGisStationsMeasurements, fetchOptions);
-        // console.log("✅ fetchGisStationsMeasurementsService erfolgreich!");
-        requestCount++;
-        localStorage.setItem("fetchWebServiceMap", requestCount);
-
-        // GIS System Static abrufen
-        //console.log("⏳ Abrufen von GIS System Static...");
-        await fetchGisSystemStaticService(mapGisSystemStaticUrl, setGisSystemStatic, setGisSystemStaticLoaded, fetchOptions);
-        //console.log("✅ fetchGisSystemStaticService erfolgreich!");
-        requestCount++;
-        localStorage.setItem("fetchWebServiceMap", requestCount);
-      } catch (error) {
-        console.error("❌ Fehler beim Abrufen der WebService-Daten:", error);
-      }
-    };
-
-    fetchWebServiceMap();
-  }, [mapGisStationsStatusDistrictUrl, mapGisStationsMeasurementsUrl, mapGisSystemStaticUrl]);
-};
-
-export default useFetchWebServiceMap;

components/pois/PoiUpdateModal.js

@@ -1,28 +1,17 @@
 // /components/pois/PoiUpdateModal.js
 import React, { useState, useEffect } from "react";
 import Select from "react-select"; // Importiere react-select
-import { selectedPoiState } from "../../redux/slices/selectedPoiSlice";
-import { currentPoiState } from "../../redux/slices/currentPoiSlice";
-import { mapLayersState } from "../../redux/slices/mapLayersSlice";
-
 import { fetchLocationDevicesFromDB } from "../../redux/slices/db/locationDevicesFromDBSlice";
 import { useSelector, useDispatch } from "react-redux";
-
-import { selectCurrentPoi } from "../../redux/slices/currentPoiSlice";
 import { selectMapLayersState } from "../../redux/slices/mapLayersSlice";
 
 const PoiUpdateModal = ({ onClose, poiData, onSubmit }) => {
   const dispatch = useDispatch();
-
-  const currentPoi = useSelector(selectCurrentPoi);
-  const selectedPoi = useSelector(selectCurrentPoi);
   const mapLayersVisibility = useSelector(selectMapLayersState);
-
   const [poiId, setPoiId] = useState(poiData ? poiData.idPoi : "");
   const [name, setName] = useState(poiData ? poiData.name : "");
   const [poiTypData, setPoiTypData] = useState([]);
   const [poiTypeId, setPoiTypeId] = useState(null); // Verwende null für react-select
-  const [locationDeviceData, setLocationDeviceData] = useState([]);
   const [filteredDevices, setFilteredDevices] = useState([]);
   const [deviceName, setDeviceName] = useState(poiData ? poiData.deviceName : null); // Verwende null für react-select
   const [idLD, setIdLD] = useState(poiData ? poiData.idLD : "");