Version 1.0.2 mit node_modules Verzeichnis

hooks/layers/useGmaMarkersLayer.js

@@ -1,26 +1,49 @@
-// /hooks/layers/useGmaMarkersLayer.js
 import { useEffect } from "react";
 import { addContextMenuToMarker } from "../../utils/addContextMenuToMarker";
 
-const useGmaMarkersLayer = (map, gmaMarkers, GisStationsMeasurements, GMA, oms) => {
+const useGmaMarkersLayer = (
+  map,
+  gmaMarkers,
+  GisStationsMeasurements,
+  GMA,
+  oms
+) => {
   useEffect(() => {
     if (map && gmaMarkers.length) {
-      const gmaMeasurements = GisStationsMeasurements.filter((m) => m.Gr === "GMA");
-      let area_name = "";
-      let measurements = {};
-
-      gmaMeasurements.forEach((m) => {
-        area_name = m.Area_Name;
-        measurements[m.Na] = m.Val;
-      });
+      // Filtere die relevanten Messungen für Fahrbahnzustand
+      const gmaMeasurements = GisStationsMeasurements.filter(
+        (m) => m.Gr === "Fahrbahnzustand"
+      );
 
       gmaMarkers.forEach((marker) => {
         marker.addTo(map);
         oms.addMarker(marker);
 
-        // Logging the data to debug
-        //console.log("Marker Data:", { area_name, measurements });
+        // Finde die Messungen, die zu diesem Marker gehören
+        const relevantMeasurements = gmaMeasurements.filter(
+          (m) => m.Area_Name === marker.options.areaName
+        );
 
+        let measurements = {};
+        let area_name = marker.options.areaName;
+
+        relevantMeasurements.forEach((m) => {
+          measurements[m.Na] = m.Val;
+        });
+
+        // Überprüfe, ob die Messwerte vorhanden sind, und setze Standardwerte
+        const lt = measurements["LT"] || "Datenlücke";
+        const fbt = measurements["FBT"] || "nicht verfügbar";
+        const gt = measurements["GT"] || "nicht verfügbar";
+        const rlf = measurements["RLF"] || "nicht verfügbar";
+
+        // Log die aktuellen Messwerte für den Marker
+   /*      
+        console.log(
+          `Marker at ${area_name} - LT: ${lt}, FBT: ${fbt}, GT: ${gt}, RLF: ${rlf}`
+        );
+ */
+        // Tooltip für den Marker binden
         marker.bindTooltip(
           `
             <div class="p-0 rounded-lg bg-white bg-opacity-90">
@@ -28,16 +51,16 @@ const useGmaMarkersLayer = (map, gmaMarkers, GisStationsMeasurements, GMA, oms)
                 <span>${area_name}</span> 
               </div>
               <div class="font-bold text-xxs text-blue-700">
-                <span>LT : ${measurements.LT} °C</span> 
+                <span>LT : ${lt} °C</span> 
               </div>
               <div class="font-bold text-xxs text-red-700">
-                <span>FBT : ${measurements.FBT} °C</span> 
+                <span>FBT : ${fbt} °C</span> 
               </div>
               <div class="font-bold text-xxs text-yellow-500">
-                <span>GT : ${measurements.GT === "nicht ermittelbar" ? measurements.GT : `${measurements.GT} °C`}</span> 
+                <span>GT : ${gt}</span> 
               </div>
               <div class="font-bold text-xxs text-green-700">
-                <span>RLF : ${measurements.RLF} %</span> 
+                <span>RLF : ${rlf} %</span> 
               </div>
             </div>
           `,
@@ -48,6 +71,7 @@ const useGmaMarkersLayer = (map, gmaMarkers, GisStationsMeasurements, GMA, oms)
           }
         );
 
+        // Ereignisse für das Öffnen und Schließen des Tooltips
         marker.on("mouseover", function () {
           this.openPopup();
         });