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);

2
config/appVersion.js
View File

@@ -1,2 +1,2 @@
// /config/appVersion
export const APP_VERSION = "1.1.118";
export const APP_VERSION = "1.1.119";

2
services/database/fetchDeviceNameByIdService.js
View File

@@ -1,4 +1,4 @@
// /services/api/fetchDeviceNameById.js
// /services/database/fetchDeviceNameById.js
export const fetchDeviceNameById = async (idLD) => {
try {
const response = await fetch(`/api/talas_v5_DB/locationDevice/locationDeviceNameById?idLD=${idLD}`);

4
services/database/fetchPoiData.js → services/database/fetchPoiDataService.js
View File

@@ -1,6 +1,6 @@
// /services/api/fetchPoiData.js
// /services/database/fetchPoiDataService.js
export const fetchPoiData = async (idPoi) => {
export const fetchPoiDataService = async (idPoi) => {
try {
const response = await fetch(`/api/talas_v5_DB/pois/getPoiById?idPoi=${idPoi}`);
if (!response.ok) throw new Error("Fehler beim Abrufen der POI-Daten");

4
services/database/updateLocationInDatabase.js → services/database/updateLocationInDatabaseService.js
View File

@@ -1,6 +1,6 @@
// /services/api/updateLocationInDatabase.js
// /services/database/updateLocationInDatabaseService.js
export const updateLocationInDatabase = async (id, newLatitude, newLongitude) => {
export const updateLocationInDatabaseService = async (id, newLatitude, newLongitude) => {
const response = await fetch("/api/talas_v5_DB/pois/updateLocation", {
method: "POST",
headers: { "Content-Type": "application/json" },

2
services/utils/fetchWithTimeout.js
View File

@@ -1,4 +1,4 @@
// services/api/fetchWithTimeout.js
// services/utils/fetchWithTimeout.js
const fetchWithTimeout = (url, options, timeout = 5000) => {
const controller = new AbortController();

2
services/webservice/fetchGisStationsMeasurementsService.js
View File

@@ -1,4 +1,4 @@
// /services/api/fetchGisStationsMeasurementsService.js
// /services/webservice/fetchGisStationsMeasurementsService.js
export const fetchGisStationsMeasurementsService = async () => {
const mode = process.env.NEXT_PUBLIC_API_PORT_MODE;

2
services/webservice/fetchGisStationsStaticDistrictService.js
View File

@@ -1,4 +1,4 @@
// /services/api/fetchGisStationsStaticDistrictService.js
// /services/webservice/fetchGisStationsStaticDistrictService.js
/**
* Holt statische GIS-Stationen-Daten für Bezirke.

2
services/webservice/fetchGisStationsStatusDistrictService.js
View File

@@ -1,4 +1,4 @@
// /services/api/fetchGisStationsStatusDistrictService.js
// /services/webservice/fetchGisStationsStatusDistrictService.js
/**
* Holt Statusinformationen der GIS-Bezirksstationen.

4
services/webservice/fetchGisStatusStations.js → services/webservice/fetchGisStatusStationsService.js
View File

@@ -1,7 +1,7 @@
// /services/api/fetchGisStatusStations.js
// /services/webservice/fetchGisStatusStationsService.js
import fetchWithTimeout from "../utils/fetchWithTimeout";
export const fetchGisStatusStations = async (idMap, idUser) => {
export const fetchGisStatusStationsService = async (idMap, idUser) => {
const mode = process.env.NEXT_PUBLIC_API_PORT_MODE;
const SERVER_URL = mode === "dev" ? `${window.location.protocol}//${window.location.hostname}:80` : `${window.location.origin}`;

4
services/webservice/fetchGisSystemStatic.js → services/webservice/fetchGisSystemStaticService.js
View File

@@ -1,6 +1,6 @@
// /services/api/fetchGisSystemStatic.js
// /services/webservice/fetchGisSystemStaticService.js
export const fetchGisSystemStatic = async (url, setGisSystemStatic, setGisSystemStaticLoaded) => {
export const fetchGisSystemStaticService = async (url, setGisSystemStatic, setGisSystemStaticLoaded) => {
try {
const response = await fetch(url);
const jsonResponse = await response.json();

4
services/webservice/fetchUserRights.js → services/webservice/fetchUserRightsService.js
View File

@@ -1,7 +1,7 @@
// /services/api/fetchUserRights.js
// /services/webservice/fetchUserRightsService.js
import * as config from "../../config/config";
export const fetchUserRights = async () => {
export const fetchUserRightsService = async () => {
if (config.USE_MOCK_API) {
console.log("⚠️ Mock-API: Benutzerrechte geladen");
return [56, 57, 58]; // Beispielrechte

11
utils/polylines/setupPolylines.js
View File

@@ -1,23 +1,14 @@
// utils/polylines/setupPolylines.js
import { findClosestPoints } from "../geometryUtils";
import handlePoiSelect from "../handlePoiSelect";
import { updateLocationInDatabase } from "../../services/database/updateLocationInDatabase";
import { handleEditPoi, insertNewPOI, removePOI } from "../poiUtils";
import { parsePoint } from "../geometryUtils";
import { insertNewPOI, removePOI } from "../poiUtils";
import circleIcon from "../../components/gisPolylines/icons/CircleIcon";
import startIcon from "../../components/gisPolylines/icons/StartIcon";
import endIcon from "../../components/gisPolylines/icons/EndIcon";
import { redrawPolyline } from "./redrawPolyline";
import { openInNewTab } from "../openInNewTab";
import { toast } from "react-toastify";
import { polylineLayerVisibleState } from "../../redux/slices/polylineLayerVisibleSlice";
import { store } from "../../redux/store"; // Importiere den Store
import { openAddPoiOnPolylineModal } from "../../redux/slices/addPoiOnPolylineSlice";
import { openPolylineContextMenu, closePolylineContextMenu } from "../../redux/slices/polylineContextMenuSlice";
import { enablePolylineEvents, disablePolylineEvents } from "./eventHandlers";
import { closePolylineSelectionAndContextMenu } from "./contextMenu";
import { monitorContextMenu } from "./monitorContextMenu";
import { subscribeToPolylineContextMenu } from "./polylineSubscription";
import { forceCloseContextMenu } from "../../redux/slices/polylineContextMenuSlice";
//--------------------------------------------

4
utils/setupPOIs.js
View File

@@ -1,7 +1,7 @@
// utils/setupPOIs.js
import { findClosestPoints } from "./geometryUtils";
import handlePoiSelect from "./handlePoiSelect";
import { updateLocationInDatabase } from "../services/database/updateLocationInDatabase";
import { updateLocationInDatabaseService } from "../services/database/updateLocationInDatabaseService";
import { handleEditPoi, insertNewPOI, removePOI } from "./poiUtils";
import { parsePoint } from "./geometryUtils";
import circleIcon from "../components/gisPolylines/icons/CircleIcon";
@@ -120,7 +120,7 @@ export const setupPOIs = async (
const newLat = e.target.getLatLng().lat;
const newLng = e.target.getLatLng().lng;
const markerId = e.target.options.id;
updateLocationInDatabase(markerId, newLat, newLng).then(() => {});
updateLocationInDatabaseService(markerId, newLat, newLng).then(() => {});
} else {
console.error("Drag operation not allowed");
}