Ismail/nodeMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Quellcode aufräumen

Browse Source
This commit is contained in:
ISA
2025-05-20 13:58:53 +02:00
parent 2846bc0b13
commit 0f899e6465
16 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/mainComponent/MapComponent.js
View File

@@ -36,7 +36,7 @@ import CoordinateInput from "../CoordinateInput.js";
import CoordinateModal from "../CoordinateModal.js";
import CoordinatePopup from "../CoordinatePopup.js";
//------------------------Daten aus API--------------------
import { fetchPoiData } from "../../services/database/fetchPoiData.js";
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";
@@ -272,7 +272,25 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
useEffect(() => {
if (poiData.length === 0) return;
setupPOIs(map, locations, poiData, poiTypMap, userRights, poiLayerRef, setSelectedPoi, setLocationDeviceData, setDeviceName, setCurrentPoi, poiLayerVisible, fetchPoiData, toast, setShowPoiUpdateModal, setCurrentPoiData, deviceName, dispatch);
setupPOIs(
map,
locations,
poiData,
poiTypMap,
userRights,
poiLayerRef,
setSelectedPoi,
setLocationDeviceData,
setDeviceName,
setCurrentPoi,
poiLayerVisible,
fetchPoiDataService,
toast,
setShowPoiUpdateModal,
setCurrentPoiData,
deviceName,
dispatch
);
}, [map, locations, onLocationUpdate, poiReadTrigger, isPoiTypLoaded, userRights, poiLayerVisible, poiData, poiTypMap, dispatch]);
//---------------------------------------------

6
components/mainComponent/hooks/useFetchWebServiceMap.js
View File

@@ -2,7 +2,7 @@
import { useEffect } from "react";
import { fetchGisStationsStatusDistrictService } from "../../../services/webservice/fetchGisStationsStatusDistrictService";
import { fetchGisStationsMeasurementsService } from "../../../services/webservice/fetchGisStationsMeasurementsService";
import { fetchGisSystemStatic } from "../../../services/webservice/fetchGisSystemStatic";
import { fetchGisSystemStaticService } from "../../../services/webservice/fetchGisSystemStaticService";
const useFetchWebServiceMap = (mapGisStationsStatusDistrictUrl, mapGisStationsMeasurementsUrl, mapGisSystemStaticUrl, setGisStationsStatusDistrict, setGisStationsMeasurements, setGisSystemStatic, setGisSystemStaticLoaded) => {
useEffect(() => {
@@ -36,8 +36,8 @@ const useFetchWebServiceMap = (mapGisStationsStatusDistrictUrl, mapGisStationsMe
// GIS System Static abrufen
//console.log("⏳ Abrufen von GIS System Static...");
await fetchGisSystemStatic(mapGisSystemStaticUrl, setGisSystemStatic, setGisSystemStaticLoaded, fetchOptions);
//console.log("✅ fetchGisSystemStatic erfolgreich!");
await fetchGisSystemStaticService(mapGisSystemStaticUrl, setGisSystemStatic, setGisSystemStaticLoaded, fetchOptions);
//console.log("✅ fetchGisSystemStaticService erfolgreich!");
requestCount++;
localStorage.setItem("fetchWebServiceMap", requestCount);
} catch (error) {

4
components/mainComponent/hooks/useLoadUserRights.js
View File

@@ -1,11 +1,11 @@
// /components/mainComponent/hooks/useLoadUserRights.js
import { useEffect } from "react";
import { fetchUserRights } from "../../../services/webservice/fetchUserRights";
import { fetchUserRightsService } from "../../../services/webservice/fetchUserRightsService";
const useLoadUserRights = (setUserRights, setIsRightsLoaded, setHasRights) => {
useEffect(() => {
const fetchAndSetUserRights = async () => {
const rights = await fetchUserRights();
const rights = await fetchUserRightsService();
setUserRights(rights);
setIsRightsLoaded(true);