mockApi erstellt, um die Eingabe zu simulieren, aber funktioniert nocht nicht ganz
This commit is contained in:
@@ -2,7 +2,8 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import L from "leaflet";
|
||||
import { addContextMenuToMarker } from "../../utils/addContextMenuToMarker";
|
||||
//import { fetchDeviceNameById } from "../services/apiService";
|
||||
//import { fetchDeviceNameById } from "../services/api/fetchDeviceNameById";
|
||||
|
||||
|
||||
const useUlafMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
|
||||
const [ulafMarkers, setUlafMarkers] = useState([]);
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
// /hooks/useFetchWebServiceMap.js
|
||||
import { useEffect } from "react";
|
||||
import {
|
||||
fetchGisStationsStaticDistrict,
|
||||
fetchGisStationsStatusDistrict,
|
||||
fetchGisStationsMeasurements,
|
||||
fetchGisSystemStatic,
|
||||
} from "../services/fetchData";
|
||||
import { fetchGisStationsStaticDistrict } from "../services/api/fetchGisStationsStaticDistrict";
|
||||
import { fetchGisStationsStatusDistrict } from "../services/api/fetchGisStationsStatusDistrict";
|
||||
import { fetchGisStationsMeasurements } from "../services/api/fetchGisStationsMeasurements";
|
||||
import { fetchGisSystemStatic } from "../services/api/fetchGisSystemStatic";
|
||||
|
||||
export const useFetchWebServiceMap = (
|
||||
dispatch,
|
||||
@@ -32,39 +31,22 @@ export const useFetchWebServiceMap = (
|
||||
};
|
||||
|
||||
// Fetch GIS Stations Static District
|
||||
await fetchGisStationsStaticDistrict(
|
||||
mapGisStationsStaticDistrictUrl,
|
||||
dispatch,
|
||||
fetchOptions
|
||||
);
|
||||
await fetchGisStationsStaticDistrict(mapGisStationsStaticDistrictUrl, dispatch, fetchOptions);
|
||||
requestCount++;
|
||||
localStorage.setItem("fetchWebServiceMap", requestCount);
|
||||
|
||||
// Fetch GIS Stations Status District
|
||||
await fetchGisStationsStatusDistrict(
|
||||
mapGisStationsStatusDistrictUrl,
|
||||
setGisStationsStatusDistrict,
|
||||
fetchOptions
|
||||
);
|
||||
await fetchGisStationsStatusDistrict(mapGisStationsStatusDistrictUrl, setGisStationsStatusDistrict, fetchOptions);
|
||||
requestCount++;
|
||||
localStorage.setItem("fetchWebServiceMap", requestCount);
|
||||
|
||||
// Fetch GIS Stations Measurements
|
||||
await fetchGisStationsMeasurements(
|
||||
mapGisStationsMeasurementsUrl,
|
||||
setGisStationsMeasurements,
|
||||
fetchOptions
|
||||
);
|
||||
await fetchGisStationsMeasurements(mapGisStationsMeasurementsUrl, setGisStationsMeasurements, fetchOptions);
|
||||
requestCount++;
|
||||
localStorage.setItem("fetchWebServiceMap", requestCount);
|
||||
|
||||
// Fetch GIS System Static
|
||||
await fetchGisSystemStatic(
|
||||
mapGisSystemStaticUrl,
|
||||
setGisSystemStatic,
|
||||
setGisSystemStaticLoaded,
|
||||
fetchOptions
|
||||
);
|
||||
await fetchGisSystemStatic(mapGisSystemStaticUrl, setGisSystemStatic, setGisSystemStaticLoaded, fetchOptions);
|
||||
requestCount++;
|
||||
localStorage.setItem("fetchWebServiceMap", requestCount);
|
||||
} catch (error) {
|
||||
@@ -73,15 +55,5 @@ export const useFetchWebServiceMap = (
|
||||
};
|
||||
|
||||
fetchWebServiceMap();
|
||||
}, [
|
||||
dispatch,
|
||||
mapGisStationsStaticDistrictUrl,
|
||||
mapGisStationsStatusDistrictUrl,
|
||||
mapGisStationsMeasurementsUrl,
|
||||
mapGisSystemStaticUrl,
|
||||
setGisStationsStatusDistrict,
|
||||
setGisStationsMeasurements,
|
||||
setGisSystemStatic,
|
||||
setGisSystemStaticLoaded,
|
||||
]);
|
||||
}, [dispatch, mapGisStationsStaticDistrictUrl, mapGisStationsStatusDistrictUrl, mapGisStationsMeasurementsUrl, mapGisSystemStaticUrl, setGisStationsStatusDistrict, setGisStationsMeasurements, setGisSystemStatic, setGisSystemStaticLoaded]);
|
||||
};
|
||||
|
||||
@@ -1,14 +1,7 @@
|
||||
import { useEffect } from "react";
|
||||
import { fetchGisStationsMeasurements } from "../services/fetchData";
|
||||
import { fetchGisStationsMeasurements } from "../services/api/fetchGisStationsMeasurements";
|
||||
|
||||
export const useUpdateGmaData = (
|
||||
map,
|
||||
setGisStationsMeasurements,
|
||||
mapGisStationsMeasurementsUrl,
|
||||
gmaMarkers,
|
||||
layers,
|
||||
oms
|
||||
) => {
|
||||
export const useUpdateGmaData = (map, setGisStationsMeasurements, mapGisStationsMeasurementsUrl, gmaMarkers, layers, oms) => {
|
||||
useEffect(() => {
|
||||
if (!map) return; // Sicherstellen, dass die Karte initialisiert ist
|
||||
|
||||
@@ -22,11 +15,7 @@ export const useUpdateGmaData = (
|
||||
};
|
||||
|
||||
// Aktualisiere die Messdaten
|
||||
await fetchGisStationsMeasurements(
|
||||
mapGisStationsMeasurementsUrl,
|
||||
setGisStationsMeasurements,
|
||||
fetchOptions
|
||||
);
|
||||
await fetchGisStationsMeasurements(mapGisStationsMeasurementsUrl, setGisStationsMeasurements, fetchOptions);
|
||||
|
||||
// Aktualisiere die Marker-Layer
|
||||
// useGmaMarkersLayer(map, gmaMarkers, GisStationsMeasurements, layers.MAP_LAYERS.GMA, oms);
|
||||
@@ -44,12 +33,5 @@ export const useUpdateGmaData = (
|
||||
}, 5000);
|
||||
|
||||
return () => clearInterval(intervalId); */
|
||||
}, [
|
||||
map,
|
||||
gmaMarkers,
|
||||
layers.MAP_LAYERS.GMA,
|
||||
oms,
|
||||
mapGisStationsMeasurementsUrl,
|
||||
setGisStationsMeasurements,
|
||||
]);
|
||||
}, [map, gmaMarkers, layers.MAP_LAYERS.GMA, oms, mapGisStationsMeasurementsUrl, setGisStationsMeasurements]);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user