From 415e772e57a897e361bc5064f8c5df308696c6a7 Mon Sep 17 00:00:00 2001
From: Peter Meier <peter.meier.1986@gmail.com>
Date: Sat, 6 Jun 2026 09:22:00 +0200
Subject: [PATCH] fix: Windkarte verbirgt Labels ausgeblendeter Status
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per-Status LayerGroups statt einer globalen labelLayer. syncLabels
respektiert hiddenStatuses und entfernt Labels für versteckte
Status-Kategorien beim Zoomen.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/lib/components/WindkarteMap.svelte | 48 +++++++++++++++++---------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/lib/components/WindkarteMap.svelte b/src/lib/components/WindkarteMap.svelte
index d8a197b..3f41f62 100644
--- a/src/lib/components/WindkarteMap.svelte
+++ b/src/lib/components/WindkarteMap.svelte
@@ -33,6 +33,7 @@
   let _hidden: string[] = [];
   $effect(() => {
     _hidden = hiddenStatuses;
+    syncLabelsFn?.();
     if (!geojsonLayer) return;
     restyleAll(selectedSlug);
     // Deselect if selected area's status was just hidden.
@@ -58,7 +59,8 @@
   let bufferLayer: import("leaflet").LayerGroup | null = null;
   let ring2kmLayer: import("leaflet").LayerGroup | null = null;
   let ring5kmLayer: import("leaflet").LayerGroup | null = null;
-  let labelLayer: import("leaflet").LayerGroup | null = null;
+  let labelLayers: Record<string, import("leaflet").LayerGroup> = {};
+  let syncLabelsFn: (() => void) | null = null;
   let selectedSlug = $state<string | null>(null);
   let geojsonLayer: import("leaflet").GeoJSON | null = null;
   let buffering = $state(false);
@@ -198,7 +200,13 @@
 
     map = L.map(mapEl, { zoomControl: true, attributionControl: false }).setView([50.62, 10.42], 10);
     L.control.attribution({ position: "bottomleft" }).addTo(map);
-    labelLayer = L.layerGroup(); // not added to map yet — shown only at zoom >= 13
+    // One label LayerGroup per status — lets syncLabels respect hiddenStatuses
+    labelLayers = {
+      rechtskraeftig: L.layerGroup(),
+      entwurf_2: L.layerGroup(),
+      entwurf_2_voraussichtlich: L.layerGroup(),
+      entwurf_3: L.layerGroup(),
+    };
     onready?.({ reset: () => map!.setView([50.62, 10.42], 10) });
 
     L.tileLayer("https://tile.openstreetmap.org/{z}/{x}/{y}.png", {
@@ -295,7 +303,9 @@
 
           // Permanent label via divIcon marker at polygon center
           const nr = area.gebiets_nr ?? p.name;
-          if (nr && labelLayer) {
+          const featStatus = (feature?.properties?.status ?? "rechtskraeftig") as string;
+          const targetGroup = labelLayers[featStatus] ?? labelLayers.rechtskraeftig;
+          if (nr && targetGroup) {
             const center = (layer as import("leaflet").Polygon).getBounds().getCenter();
             L.marker(center, {
               icon: L.divIcon({
@@ -306,29 +316,35 @@
               }),
               interactive: false,
               keyboard: false,
-            }).addTo(labelLayer);
+            }).addTo(targetGroup);
           }
         },
       }).addTo(map);
 
       restyleAll(selectedSlug);
 
-      // Labels: show from zoom 13, scale font proportionally with zoom
+      // Labels: show from zoom 13, scale font proportionally with zoom.
+      // Per-status LayerGroup so hidden statuses also hide their labels.
       const syncLabels = () => {
-        if (!labelLayer || !map) return;
+        if (!map) return;
         const z = map.getZoom();
-        if (z >= 13) {
-          if (!map.hasLayer(labelLayer)) map.addLayer(labelLayer);
-          const fontSize = Math.max(8, Math.min(26, Math.round(9 * Math.pow(2, z - 13))));
-          labelLayer.eachLayer((l) => {
-            const el = (l as import("leaflet").Marker).getElement();
-            const span = el?.querySelector<HTMLElement>(".windkarte-label");
-            if (span) span.style.fontSize = fontSize + "px";
-          });
-        } else {
-          if (map.hasLayer(labelLayer)) map.removeLayer(labelLayer);
+        const show = z >= 13;
+        const fontSize = Math.max(8, Math.min(26, Math.round(9 * Math.pow(2, z - 13))));
+        for (const [status, layer] of Object.entries(labelLayers)) {
+          const visible = show && !_hidden.includes(status);
+          if (visible) {
+            if (!map.hasLayer(layer)) map.addLayer(layer);
+            layer.eachLayer((l) => {
+              const el = (l as import("leaflet").Marker).getElement();
+              const span = el?.querySelector<HTMLElement>(".windkarte-label");
+              if (span) span.style.fontSize = fontSize + "px";
+            });
+          } else {
+            if (map.hasLayer(layer)) map.removeLayer(layer);
+          }
         }
       };
+      syncLabelsFn = syncLabels;
       map.on("zoomend", syncLabels);
       syncLabels();