From 2a615d02c7593e2ca411cd3032014bba8a5a20ff Mon Sep 17 00:00:00 2001 From: Ismail Ali Date: Mon, 19 May 2025 21:13:10 +0200 Subject: [PATCH] MapComponent.js bereinigt von unbenutzte Variablen --- components/mainComponent/MapComponent.js | 84 ++---------------------- config/appVersion.js | 2 +- 2 files changed, 6 insertions(+), 80 deletions(-) diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index 2a484dc25..d12da7a91 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -18,46 +18,26 @@ import { createAndSetDevices } from "../../utils/devices/createAndSetDevices.js" import { restoreMapSettings, checkOverlappingMarkers } from "../../utils/mapUtils.js"; import { APP_VERSION } from "../../config/appVersion.js"; import * as layers from "../../config/layers.js"; -import { initializeMap } from "../../utils/initializeMap.js"; import addItemsToMapContextMenu from "../useMapContextMenu.js"; -import useGmaMarkersLayer from "../../hooks/layers/useGmaMarkersLayer.js"; // Import the custom hook +import useGmaMarkersLayer from "../../hooks/layers/useGmaMarkersLayer.js"; import useSmsfunkmodemMarkersLayer from "../../hooks/layers/useSmsfunkmodemMarkersLayer.js"; import useBereicheMarkersLayer from "../../hooks/layers/useBereicheMarkersLayer.js"; import { setupPolylines } from "../../utils/polylines/setupPolylines.js"; import { setupPOIs } from "../../utils/setupPOIs.js"; import VersionInfoModal from "../VersionInfoModal.js"; -import useDrawLines from "../../hooks/layers/useDrawLines.js"; - import useLayerVisibility from "../../hooks/useLayerVisibility.js"; import useLineData from "../../hooks/useLineData.js"; - -//import { useCreateAndSetDevices } from "../hooks/useCreateAndSetDevices"; import { useMapComponentState } from "../../hooks/useMapComponentState.js"; import { updateLocation } from "../../utils/updateBereichUtil.js"; -//-------------------------------------------- -//import { currentPoiState } from "../redux/slices/currentPoiSlice.js"; - -import { selectedPoiState } from "../../redux/slices/selectedPoiSlice.js"; -import { gisSystemStaticState } from "../../redux/slices/webService/gisSystemStaticSlice.js"; import { selectMapLayersState } from "../../redux/slices/mapLayersSlice"; - -import { polylineLayerVisibleState } from "../../redux/slices/polylineLayerVisibleSlice.js"; -//-------------------------------------------- import { useSelector, useDispatch } from "react-redux"; -import { selectCurrentPoi, setCurrentPoi, clearCurrentPoi } from "../../redux/slices/currentPoiSlice.js"; +import { setCurrentPoi } from "../../redux/slices/currentPoiSlice.js"; import CoordinateInput from "../CoordinateInput.js"; import CoordinateModal from "../CoordinateModal.js"; import CoordinatePopup from "../CoordinatePopup.js"; //------------------------Daten aus API-------------------- -import { fetchUserRights } from "../../services/api/fetchUserRights.js"; import { fetchPoiData } from "../../services/api/fetchPoiData.js"; -import { fetchGisStationsStaticDistrict } from "../../services/api/fetchGisStationsStaticDistrict.js"; - -import { fetchGisStationsStatusDistrict } from "../../services/api/fetchGisStationsStatusDistrict.js"; - import { fetchGisStationsMeasurements } from "../../services/api/fetchGisStationsMeasurements.js"; -import { fetchGisSystemStatic } from "../../services/api/fetchGisSystemStatic.js"; -import { usePolylineTooltipLayer } from "../../hooks/usePolylineTooltipLayer.js"; import { selectPolylineVisible, setPolylineVisible } from "../../redux/slices/polylineLayerVisibleSlice.js"; import { useInitLocationDevices } from "./hooks/webServices/useInitLocationDevices"; import { useInitGisStationsStaticDistrict } from "./hooks/webServices/useInitGisStationsStaticDistrict"; @@ -68,55 +48,32 @@ import { useInitGisSystemStatic } from "./hooks/webServices/useInitGisSystemStat import { selectGisSystemStatic, setGisSystemStatic } from "../../redux/slices/webService/gisSystemStaticSlice"; import ShowAddStationPopup from "../AddPOIModal.js"; import { useInitGisStationsStatic } from "../mainComponent/hooks/webServices/useInitGisStationsStatic"; -import { closeAddPoiModal } from "../../redux/slices/addPoiOnPolylineSlice.js"; import AddPOIOnPolyline from "../AddPOIOnPolyline"; import { enablePolylineEvents, disablePolylineEvents } from "../../utils/polylines/eventHandlers"; -import { updateCountdown, closePolylineContextMenu, forceCloseContextMenu } from "../../redux/slices/polylineContextMenuSlice"; +import { updateCountdown, closePolylineContextMenu } from "../../redux/slices/polylineContextMenuSlice"; //-------------------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, clearSelectedPoi } from "../../redux/slices/selectedPoiSlice"; -import { setupDevices } from "../../utils/setupDevices"; +import { setSelectedPoi } from "../../redux/slices/selectedPoiSlice"; import { setDisabled } from "../../redux/slices/polylineEventsDisabledSlice"; import { setMapId, setUserId } from "../../redux/slices/urlParameterSlice"; import { fetchPoiTypes } from "../../redux/slices/db/poiTypesSlice"; const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { const dispatch = useDispatch(); - // Redux-States holen - const selectedPoi = useSelector((state) => state.selectedPoi); - const selectedDevice = useSelector((state) => state.selectedDevice); const countdown = useSelector((state) => state.polylineContextMenu.countdown); const countdownActive = useSelector((state) => state.polylineContextMenu.countdownActive); const isPolylineContextMenuOpen = useSelector((state) => state.polylineContextMenu.isOpen); - - const contextMenuState = useSelector((state) => state.polylineContextMenu); - - const polylinePosition = contextMenuState.position ? L.latLng(contextMenuState.position.lat, contextMenuState.position.lng) : null; - const currentPoi = useSelector(selectCurrentPoi); - const polylineVisible = useSelector(selectPolylineVisible); - const [editMode, setEditMode] = useState(false); // editMode Zustand const { deviceName, setDeviceName } = useMapComponentState(); - const poiTypData = useSelector((state) => state.poiTypes.data); const poiTypStatus = useSelector((state) => state.poiTypes.status); const isPoiTypLoaded = useSelector((state) => state.poiTypes.status === "succeeded"); - - //const [deviceName, setDeviceName] = useState(""); const [locationDeviceData, setLocationDeviceData] = useState([]); const [priorityConfig, setPriorityConfig] = useState([]); const [menuItemAdded, setMenuItemAdded] = useState(false); - const [isModalOpen, setIsModalOpen] = useState(false); - const closeModal = () => setIsModalOpen(false); - const openModalWithCoordinates = (e) => { - const coordinates = `${e.latlng.lat.toFixed(5)}, ${e.latlng.lng.toFixed(5)}`; - setCurrentCoordinates(coordinates); - setIsModalOpen(true); - }; - const [isPopupOpen, setIsPopupOpen] = useState(false); const openPopupWithCoordinates = (e) => { @@ -132,10 +89,8 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { const poiLayerVisible = useSelector((state) => state.poiLayerVisible.visible); const [isRightsLoaded, setIsRightsLoaded] = useState(false); const [hasRights, setHasRights] = useState(false); - const [AddPoiModalWindowState, setAddPoiModalWindowState] = useState(false); const [userRights, setUserRights] = useState(null); - const [showPoiUpdateModal, setShowPoiUpdateModal] = useState(false); const [currentPoiData, setCurrentPoiData] = useState(null); const [showVersionInfoModal, setShowVersionInfoModal] = useState(false); @@ -153,7 +108,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { const [GisStationsMeasurements, setGisStationsMeasurements] = useState([]); // Zustand für Messdaten const GisSystemStatic = useSelector(selectGisSystemStatic); // Konstanten für die URLs - const mapGisStationsStaticDistrictUrl = config.mapGisStationsStaticDistrictUrl; const mapGisStationsStatusDistrictUrl = config.mapGisStationsStatusDistrictUrl; const mapGisStationsMeasurementsUrl = config.mapGisStationsMeasurementsUrl; const mapGisSystemStaticUrl = config.mapGisSystemStaticUrl; @@ -181,7 +135,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { const [linesData, setLinesData] = useState([]); const mapLayersVisibility = useSelector(selectMapLayersState) || {}; const selectedArea = useSelector((state) => state.selectedArea.area); - const [linePositions, setLinePositions] = useState([]); const { lineColors, tooltipContents } = useLineData(webserviceGisLinesStatusUrl, setLineStatusData); const [polylines, setPolylines] = useState([]); @@ -254,8 +207,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { const sonstigeMarkersLayerRef = useRef(null); const tkComponentsMarkersRef = useRef(null); useInitializeMap(map, mapRef, setMap, setOms, setMenuItemAdded, addItemsToMapContextMenu, hasRights, (value) => dispatch(setDisabled(value))); - const mapId = useSelector((state) => state.urlParameter.mapId); - const userId = useSelector((state) => state.urlParameter.userId); //--------------------------------------------------------------- useEffect(() => { const params = new URL(window.location.href).searchParams; @@ -264,10 +215,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { }, [dispatch]); //--------------------------------------------------------------- useFetchWebServiceMap(mapGisStationsStatusDistrictUrl, mapGisStationsMeasurementsUrl, mapGisSystemStaticUrl, setGisStationsStatusDistrict, setGisStationsMeasurements, setGisSystemStatic, setGisSystemStaticLoaded); - //Test in useEffect - /* useEffect(() => { - console.log("📌 Alle Marker in MapComponent in useFetchWebServiceMap:", allMarkers); - }, [allMarkers]); */ //-------------------------------------------------------- useEffect(() => { const endpoint = "/api/talas_v5_DB/gisLines/readGisLines"; @@ -302,11 +249,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { const [poiData, setPoiData] = useState([]); // POIs Popup Informationen anzeigen useFetchPoiData(setPoiTypMap, setPoiData); - //Test in useEffect - /* useEffect(() => { - console.log("📌 POI-Typ Map in MapComponent:", poiTypMap); - console.log("📌 POI-Daten in MapComponent:", poiData); - }, [poiTypMap, poiData]); */ //-------------------------------------------- // POIs auf die Karte zeichnen @@ -340,7 +282,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { } }, [gisSystemStaticLoaded, map, GisSystemStatic, priorityConfig]); //-------------------------------------------- - //-------------------------------------------- useEffect(() => { if (map) { var x = 51.41321407879154; @@ -355,7 +296,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { } }, [map, zoomTrigger]); //-------------------------------------------- - //-------------------------------------------- useEffect(() => { if (map) { // Sammle alle Marker in einer einzigen Liste @@ -443,7 +383,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { }; fetchData(); }, []); - //-------------------------------------------- //----------------------------------------------------------------- //Tooltip an mouse position anzeigen für die Linien useEffect(() => { @@ -512,7 +451,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { setPolylines(newPolylines); }, [map, linePositions, lineColors, tooltipContents, newPoint, newCoords, tempMarker, polylineVisible]); - //-------------------------------------------- //-------------------------------------------- useRestoreMapSettings(map); //Test in useEffect @@ -547,7 +485,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { } }, [map]); //-------------------------------------------- - //-------------------------------------------- // Bereich in DataSheet ->dropdownmenu useEffect(() => { //console.log("🔍 GisStationsStaticDistrict Inhalt:", GisStationsStaticDistrict); @@ -598,7 +535,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { fetchPriorityConfig(); }, []); //-------------------------------------------- - //-------------------------------------------- useEffect(() => { if (map) { @@ -700,7 +636,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { useLayerVisibility(map, messstellenMarkers, mapLayersVisibility, "Messstellen", oms); useLayerVisibility(map, ulafMarkers, mapLayersVisibility, "ULAF", oms); //-------------------------------------------- - useEffect(() => { if (!gisSystemStaticLoaded || !map) return; // Sicherstellen, dass die Karte und Daten geladen sind @@ -731,8 +666,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { }); //-------------------------------------------- - //-------------------------------------------- - const updateMarkers = ({ ref, id, setState }) => { if (ref.current) { ref.current.clearLayers(); // Entferne alte Marker @@ -916,12 +849,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { } }; //-------------------------------------------- - /* useEffect(() => { - if (map && !menuItemAdded) { - addItemsToMapContextMenu(map, menuItemAdded, setMenuItemAdded, openModalWithCoordinates, hasRights, setShowPopup, setPopupCoordinates); - } - }, [map, menuItemAdded, hasRights]); */ - //-------------------------------------------- + useEffect(() => { if (map && !menuItemAdded) { addItemsToMapContextMenu( @@ -1005,9 +933,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { }, []); //--------------------------------------------- - //-------------------------------------------- - return ( <> {useSelector((state) => state.addPoiOnPolyline.isOpen) && } diff --git a/config/appVersion.js b/config/appVersion.js index f64ee250e..dbd00dc26 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.105"; +export const APP_VERSION = "1.1.106";