diff --git a/.env.local b/.env.local index fe40331b3..b22d1e064 100644 --- a/.env.local +++ b/.env.local @@ -1,31 +1,31 @@ #.env.local #je nach dem Mysql Server, ob localhost freigegeben ist oder die IP Adresse des Servers, manchmal die beide und manchmal nur eine -DB_HOST=10.10.0.13 -DB_USER=root -DB_PASSWORD="root#$" -DB_NAME=talas_v5 -DB_PORT=3306 -######################### - -NEXT_PUBLIC_BASE_URL="http://10.10.0.13/talas5/devices/" -NEXT_PUBLIC_SERVER_URL="http://10.10.0.13" -NEXT_PUBLIC_PROXY_TARGET="http://10.10.0.13" -NEXT_PUBLIC_ONLINE_TILE_LAYER="http://10.10.0.13:3000/mapTiles/{z}/{x}/{y}.png" -######################### - - -#DB_HOST=10.10.0.70 +#DB_HOST=10.10.0.13 #DB_USER=root #DB_PASSWORD="root#$" #DB_NAME=talas_v5 #DB_PORT=3306 - ######################### -#NEXT_PUBLIC_BASE_URL="http://10.10.0.30/talas5/devices/" -#NEXT_PUBLIC_SERVER_URL="http://10.10.0.70" -#NEXT_PUBLIC_PROXY_TARGET="http://10.10.0.70" +#NEXT_PUBLIC_BASE_URL="http://10.10.0.13/talas5/devices/" +#NEXT_PUBLIC_SERVER_URL="http://10.10.0.13" +#NEXT_PUBLIC_PROXY_TARGET="http://10.10.0.13" +#NEXT_PUBLIC_ONLINE_TILE_LAYER="http://10.10.0.13:3000/mapTiles/{z}/{x}/{y}.png" +######################### + + +DB_HOST=10.10.0.70 +DB_USER=root +DB_PASSWORD="root#$" +DB_NAME=talas_v5 +DB_PORT=3306 + +######################### +#device nur Verlinkung wenn die gleiche DB ist +NEXT_PUBLIC_BASE_URL="http://10.10.0.30/talas5/devices/" +NEXT_PUBLIC_SERVER_URL="http://10.10.0.70" +NEXT_PUBLIC_PROXY_TARGET="http://10.10.0.70" #NEXT_PUBLIC_ONLINE_TILE_LAYER="http://10.10.0.13:3000/mapTiles/{z}/{x}/{y}.png" ######################### @@ -42,4 +42,4 @@ NEXT_PUBLIC_ONLINE_TILE_LAYER="http://10.10.0.13:3000/mapTiles/{z}/{x}/{y}.png" #NEXT_PUBLIC_ONLINE_TILE_LAYER="http://192.168.10.14:3000/mapTiles/{z}/{x}/{y}.png" ######################### online -#NEXT_PUBLIC_ONLINE_TILE_LAYER="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" \ No newline at end of file +NEXT_PUBLIC_ONLINE_TILE_LAYER="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" \ No newline at end of file diff --git a/components/MapComponent.js b/components/MapComponent.js index 42e0fca20..86ac53089 100644 --- a/components/MapComponent.js +++ b/components/MapComponent.js @@ -392,7 +392,6 @@ await fetchGisStationsStatusDistrict(mapGisStationsStatusDistrictUrl, setGisStat //console.log("priorityConfig in MapComponent2: ", priorityConfig); useEffect(() => { if (gisSystemStaticLoaded && map) { - createAndSetDevices(11, setGmaMarkers, GisSystemStatic, priorityConfig); // GMA-System createAndSetDevices(1, setTalasMarkers, GisSystemStatic, priorityConfig); // TALAS-System createAndSetDevices(2, setEciMarkers, GisSystemStatic, priorityConfig); // ECI-System @@ -679,7 +678,7 @@ await fetchGisStationsStatusDistrict(mapGisStationsStatusDistrictUrl, setGisStat useEffect(() => { if (!map) return; // Stelle sicher, dass die Karte initialisiert ist - + const updateGmaData = async () => { try { const fetchOptions = { @@ -688,51 +687,47 @@ await fetchGisStationsStatusDistrict(mapGisStationsStatusDistrictUrl, setGisStat Connection: "close", }, }; - + // Aktualisiere die Messdaten await fetchGisStationsMeasurements(mapGisStationsMeasurementsUrl, setGisStationsMeasurements, fetchOptions); await fetchGisStationsStatusDistrict(mapGisStationsStatusDistrictUrl, setGisStationsStatusDistrict, fetchOptions); - - // Aktualisiere die Marker-Layer useGmaMarkersLayer(map, gmaMarkers, GisStationsMeasurements, layers.MAP_LAYERS.GMA, oms); - } catch (error) { console.error("Fehler beim Aktualisieren der GMA-Daten:", error); } }; - + // Initialer Datenabruf updateGmaData(); - + // Setze ein Intervall, um die Daten alle 5 Sekunden zu aktualisieren const intervalId = setInterval(() => { updateGmaData(); }, 5000); - + // Cleanup-Funktion, um das Intervall zu entfernen, wenn die Komponente entladen wird return () => clearInterval(intervalId); - }, [map, gmaMarkers, layers.MAP_LAYERS.GMA, oms, mapGisStationsMeasurementsUrl,mapGisStationsStatusDistrictUrl]); + }, [map, gmaMarkers, layers.MAP_LAYERS.GMA, oms, mapGisStationsMeasurementsUrl, mapGisStationsStatusDistrictUrl]); - //--------------------------------- - + const markerLayerRef = useRef(null); useEffect(() => { if (!gisSystemStaticLoaded || !map) return; // Sicherstellen, dass alle Abhängigkeiten geladen sind - + // Initialisiere die LayerGroup, falls noch nicht vorhanden if (!markerLayerRef.current) { markerLayerRef.current = new L.LayerGroup().addTo(map); } - + const updateMarkers = () => { // Alte Marker entfernen markerLayerRef.current.clearLayers(); - + // Neue Marker für jedes System erstellen -/* createAndSetDevices(11, (markers) => { + /* createAndSetDevices(11, (markers) => { setGmaMarkers(markers); markers.forEach((marker) => marker.addTo(markerLayerRef.current)); // Marker zur LayerGroup hinzufügen }, GisSystemStatic, priorityConfig); @@ -740,15 +735,15 @@ await fetchGisStationsStatusDistrict(mapGisStationsStatusDistrictUrl, setGisStat createAndSetDevices(11, setGmaMarkers, GisSystemStatic, priorityConfig); // Füge hier weitere `createAndSetDevices`-Aufrufe für andere Systeme ein }; - + // Initiales Update der Marker updateMarkers(); - + // Setze ein Intervall, um die Marker alle 10 Sekunden zu aktualisieren const intervalId = setInterval(() => { updateMarkers(); }, 10000); // 10 Sekunden - + // Aufräumen bei Komponentenentladung return () => { clearInterval(intervalId); @@ -758,10 +753,9 @@ await fetchGisStationsStatusDistrict(mapGisStationsStatusDistrictUrl, setGisStat }; }, [gisSystemStaticLoaded, map, GisSystemStatic, priorityConfig]); + //--------------------------------------- -//--------------------------------------- - -//----------------- + //----------------- return ( <> diff --git a/hooks/layers/useGmaMarkersLayer.js b/hooks/layers/useGmaMarkersLayer.js index d7f0561a5..d440640c9 100644 --- a/hooks/layers/useGmaMarkersLayer.js +++ b/hooks/layers/useGmaMarkersLayer.js @@ -15,6 +15,7 @@ const useMarkersLayer = (map, markers, GisStationsMeasurements, GMA, oms) => { let measurements = {}; let area_name = marker.options.areaName; + let idLD = marker.options.idLD; relevantMeasurements.forEach((m) => { measurements[m.Na] = m.Val; @@ -27,6 +28,7 @@ const useMarkersLayer = (map, markers, GisStationsMeasurements, GMA, oms) => { const rlf = measurements["RLF"] || "---"; console.log(`Station oder Bereich ${area_name} - LT: ${lt}, FBT: ${fbt}, GT: ${gt}, RLF: ${rlf}`); + console.log(`Station idLD: ${idLD} `); // Tooltip für den Marker binden marker.bindTooltip( diff --git a/package-lock.json b/package-lock.json index 7c64886c9..404318b59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "16.09.2024 NodeMap", + "name": "nodeMap", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/public/img/icons/Stationsausfall-marker-icon-0.png b/public/img/icons/Stationsausfall-marker-icon-0.png new file mode 100644 index 000000000..451bb134d Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-0.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-1.png b/public/img/icons/Stationsausfall-marker-icon-1.png new file mode 100644 index 000000000..bb44e86d9 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-1.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-10.png b/public/img/icons/Stationsausfall-marker-icon-10.png new file mode 100644 index 000000000..7d749eb66 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-10.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-11.png b/public/img/icons/Stationsausfall-marker-icon-11.png new file mode 100644 index 000000000..ccfb2bea5 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-11.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-12.png b/public/img/icons/Stationsausfall-marker-icon-12.png new file mode 100644 index 000000000..9ad35abf0 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-12.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-13.png b/public/img/icons/Stationsausfall-marker-icon-13.png new file mode 100644 index 000000000..eb8a3a9c1 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-13.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-14.png b/public/img/icons/Stationsausfall-marker-icon-14.png new file mode 100644 index 000000000..c1b0d380a Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-14.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-15.png b/public/img/icons/Stationsausfall-marker-icon-15.png new file mode 100644 index 000000000..945b4719d Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-15.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-16.png b/public/img/icons/Stationsausfall-marker-icon-16.png new file mode 100644 index 000000000..94f76d0c5 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-16.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-17.png b/public/img/icons/Stationsausfall-marker-icon-17.png new file mode 100644 index 000000000..fee351ddc Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-17.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-18.png b/public/img/icons/Stationsausfall-marker-icon-18.png new file mode 100644 index 000000000..8623d5a87 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-18.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-19.png b/public/img/icons/Stationsausfall-marker-icon-19.png new file mode 100644 index 000000000..4f54f28a5 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-19.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-2.png b/public/img/icons/Stationsausfall-marker-icon-2.png new file mode 100644 index 000000000..78822a5a9 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-2.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-20.png b/public/img/icons/Stationsausfall-marker-icon-20.png new file mode 100644 index 000000000..fa12ff6ae Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-20.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-21.png b/public/img/icons/Stationsausfall-marker-icon-21.png new file mode 100644 index 000000000..bfd0ed7b0 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-21.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-22.png b/public/img/icons/Stationsausfall-marker-icon-22.png new file mode 100644 index 000000000..ae9f8075c Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-22.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-23.png b/public/img/icons/Stationsausfall-marker-icon-23.png new file mode 100644 index 000000000..4b32975e7 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-23.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-24.png b/public/img/icons/Stationsausfall-marker-icon-24.png new file mode 100644 index 000000000..ad3807d23 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-24.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-25.png b/public/img/icons/Stationsausfall-marker-icon-25.png new file mode 100644 index 000000000..edf581437 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-25.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-26.png b/public/img/icons/Stationsausfall-marker-icon-26.png new file mode 100644 index 000000000..0400d6811 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-26.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-27.png b/public/img/icons/Stationsausfall-marker-icon-27.png new file mode 100644 index 000000000..ba1ed3ed0 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-27.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-28.png b/public/img/icons/Stationsausfall-marker-icon-28.png new file mode 100644 index 000000000..56a5ece18 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-28.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-29.png b/public/img/icons/Stationsausfall-marker-icon-29.png new file mode 100644 index 000000000..8c9d188da Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-29.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-3.png b/public/img/icons/Stationsausfall-marker-icon-3.png new file mode 100644 index 000000000..682e0596c Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-3.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-30.png b/public/img/icons/Stationsausfall-marker-icon-30.png new file mode 100644 index 000000000..ac05a2fa6 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-30.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-31.png b/public/img/icons/Stationsausfall-marker-icon-31.png new file mode 100644 index 000000000..5e90fb5a3 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-31.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-32.png b/public/img/icons/Stationsausfall-marker-icon-32.png new file mode 100644 index 000000000..c8680ebc2 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-32.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-4.png b/public/img/icons/Stationsausfall-marker-icon-4.png new file mode 100644 index 000000000..5e90fb5a3 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-4.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-5.png b/public/img/icons/Stationsausfall-marker-icon-5.png new file mode 100644 index 000000000..858c125b8 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-5.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-6.png b/public/img/icons/Stationsausfall-marker-icon-6.png new file mode 100644 index 000000000..aca5b1b00 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-6.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-7.png b/public/img/icons/Stationsausfall-marker-icon-7.png new file mode 100644 index 000000000..d924b8cca Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-7.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-8.png b/public/img/icons/Stationsausfall-marker-icon-8.png new file mode 100644 index 000000000..d78369d22 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-8.png differ diff --git a/public/img/icons/Stationsausfall-marker-icon-9.png b/public/img/icons/Stationsausfall-marker-icon-9.png new file mode 100644 index 000000000..57fbb0fa4 Binary files /dev/null and b/public/img/icons/Stationsausfall-marker-icon-9.png differ diff --git a/public/img/icons/critical-marker-icon-31.png b/public/img/icons/critical-marker-icon-31.png new file mode 100644 index 000000000..43fae1790 Binary files /dev/null and b/public/img/icons/critical-marker-icon-31.png differ diff --git a/public/img/icons/critical-marker-icon-32.png b/public/img/icons/critical-marker-icon-32.png new file mode 100644 index 000000000..cf3663cf7 Binary files /dev/null and b/public/img/icons/critical-marker-icon-32.png differ diff --git a/public/img/icons/major-marker-icon-31.png b/public/img/icons/major-marker-icon-31.png new file mode 100644 index 000000000..9abdcc487 Binary files /dev/null and b/public/img/icons/major-marker-icon-31.png differ diff --git a/public/img/icons/major-marker-icon-32.png b/public/img/icons/major-marker-icon-32.png new file mode 100644 index 000000000..a28a3a103 Binary files /dev/null and b/public/img/icons/major-marker-icon-32.png differ diff --git a/public/img/icons/marker-icon-31.png b/public/img/icons/marker-icon-31.png new file mode 100644 index 000000000..ec96a02cf Binary files /dev/null and b/public/img/icons/marker-icon-31.png differ diff --git a/public/img/icons/marker-icon-32.png b/public/img/icons/marker-icon-32.png new file mode 100644 index 000000000..58c3e68ff Binary files /dev/null and b/public/img/icons/marker-icon-32.png differ diff --git a/public/img/icons/minor-marker-icon-31.png b/public/img/icons/minor-marker-icon-31.png new file mode 100644 index 000000000..d6601650d Binary files /dev/null and b/public/img/icons/minor-marker-icon-31.png differ diff --git a/public/img/icons/minor-marker-icon-32.png b/public/img/icons/minor-marker-icon-32.png new file mode 100644 index 000000000..0e9453530 Binary files /dev/null and b/public/img/icons/minor-marker-icon-32.png differ diff --git a/public/img/icons/system-marker-icon-31.png b/public/img/icons/system-marker-icon-31.png new file mode 100644 index 000000000..95ebd5fe2 Binary files /dev/null and b/public/img/icons/system-marker-icon-31.png differ diff --git a/public/img/icons/system-marker-icon-32.png b/public/img/icons/system-marker-icon-32.png new file mode 100644 index 000000000..fb79e7ac1 Binary files /dev/null and b/public/img/icons/system-marker-icon-32.png differ