Fix cadastral layer controls and WMS preview

wwwroot/js/lme-map.js

@@ -13,7 +13,8 @@ const lmeState = {
     gpsMarker: null,
     gpsAccuracy: null,
     gpsTrail: null,
-    currentParcelLayer: null,
+    selectedParcelsLayer: null,
+    gpsParcelLayer: null,
     gpsTrailEnabled: false,
     gpsTrailPoints: [],
     gpsWatchId: null,
@@ -30,6 +31,9 @@ window.lmeMap = {
     showSearchResult,
     displayOfficialParcel,
     exportCadastreView,
+    closeCadastrePreview,
+    clearSelectedParcels,
+    clearMapElements,
     fitImported,
     clearImported,
     addProjectMarker,
@@ -104,7 +108,8 @@ function init() {
     lmeState.currentBase = lmeState.baseLayers.satellite.addTo(lmeState.map);
     lmeState.imported = L.featureGroup().addTo(lmeState.map);
     lmeState.drawings = L.featureGroup().addTo(lmeState.map);
-    lmeState.currentParcelLayer = L.featureGroup().addTo(lmeState.map);
+    lmeState.selectedParcelsLayer = L.featureGroup().addTo(lmeState.map);
+    lmeState.gpsParcelLayer = L.featureGroup().addTo(lmeState.map);
     lmeState.gpsTrail = L.polyline([], { color: "#f97316", weight: 4, opacity: 0.85 }).addTo(lmeState.map);
 
     refreshCadastreLayer();
@@ -124,6 +129,18 @@ function init() {
     });
     lmeState.map.on("moveend", () => void updateAzureAttribution());
 
+    document.getElementById("closeWmsPreview")?.addEventListener("click", closeCadastrePreview);
+    document.getElementById("wmsPreview")?.addEventListener("click", event => {
+        if (event.target?.id === "wmsPreview") {
+            closeCadastrePreview();
+        }
+    });
+    document.addEventListener("keydown", event => {
+        if (event.key === "Escape") {
+            closeCadastrePreview();
+        }
+    });
+
     setInfo("Mappa pronta: satellite + catasto AdE");
 }
 
@@ -169,18 +186,39 @@ function displayOfficialParcel(xmlText, latitude, longitude, parcel, label, shou
             return;
         }
 
-        lmeState.currentParcelLayer.clearLayers();
+        const ref = feature.properties?.NATIONALCADASTRALREFERENCE || feature.properties?.INSPIREID_LOCALID || label;
+        const targetGroup = normalizedParcel ? lmeState.selectedParcelsLayer : lmeState.gpsParcelLayer;
+        if (!normalizedParcel) {
+            targetGroup.clearLayers();
+        }
+
+        const existingLayer = normalizedParcel
+            ? targetGroup.getLayers().find(item => item.lmeParcelReference === ref)
+            : null;
+        if (existingLayer) {
+            if (shouldFit) {
+                fitLayer(existingLayer);
+            }
+            setText("parcelState", `Particella selezionata: ${ref}`);
+            setInfo(`La particella ${ref} e' gia evidenziata sulla mappa.`);
+            return;
+        }
+
         const layer = L.geoJSON(feature, {
-            style: { color: "#ef4444", weight: 4, opacity: 1, fillColor: "#fbbf24", fillOpacity: 0.26 }
-        }).addTo(lmeState.currentParcelLayer);
+            style: normalizedParcel
+                ? { color: "#ef4444", weight: 4, opacity: 1, fillColor: "#fbbf24", fillOpacity: 0.26 }
+                : { color: "#1d4ed8", weight: 4, opacity: 1, fillColor: "#38bdf8", fillOpacity: 0.2 }
+        }).addTo(targetGroup);
+        layer.lmeParcelReference = ref;
+        layer.bindPopup(`<strong>${escapeHtml(ref)}</strong>`);
         if (shouldFit) {
             fitLayer(layer);
         }
 
-        const ref = feature.properties?.NATIONALCADASTRALREFERENCE || feature.properties?.INSPIREID_LOCALID || label;
         if (normalizedParcel) {
             setText("parcelState", `Particella selezionata: ${ref}`);
-            setInfo(`Trovata ${ref}. Ora puoi attivare il GPS e camminare dentro il confine evidenziato.`);
+            const count = lmeState.selectedParcelsLayer.getLayers().length;
+            setInfo(`Aggiunta ${ref}. Particelle evidenziate: ${count}.`);
         } else {
             setText("parcelState", `Dentro particella AdE: ${ref}`);
         }
@@ -201,12 +239,66 @@ function resize() {
 }
 
 function exportCadastreView() {
-    const center = lmeState.map.getCenter();
-    const zoom = lmeState.map.getZoom();
-    const layers = lmeState.cadastreLayers.join(",");
-    const url = `${cadastreUrl()}service=WMS&version=1.3.0&request=GetMap&layers=${encodeURIComponent(layers)}&styles=&format=image/png&transparent=true&width=1200&height=1200&crs=EPSG:4258&bbox=${center.lat - 0.01},${center.lng - 0.01},${center.lat + 0.01},${center.lng + 0.01}`;
-    window.open(url, "_blank");
-    setInfo(`Vista catastale aperta per download. Zoom corrente: ${zoom}.`);
+    const layers = activeCadastreLayers();
+    if (!layers.length) {
+        setInfo("Attiva almeno un layer catastale prima di aprire la vista WMS.");
+        return;
+    }
+
+    const bounds = lmeState.map.getBounds();
+    const size = lmeState.map.getSize();
+    const scale = Math.min(1, 1200 / size.x, 1200 / size.y);
+    const width = Math.max(256, Math.round(size.x * scale));
+    const height = Math.max(256, Math.round(size.y * scale));
+    const bbox = [bounds.getSouth(), bounds.getWest(), bounds.getNorth(), bounds.getEast()].join(",");
+    const params = new URLSearchParams({
+        service: "WMS",
+        version: "1.3.0",
+        request: "GetMap",
+        layers: layers.join(","),
+        styles: "",
+        format: "image/png",
+        transparent: "true",
+        width: String(width),
+        height: String(height),
+        crs: "EPSG:4258",
+        bbox
+    });
+    const preview = document.getElementById("wmsPreview");
+    const image = document.getElementById("wmsPreviewImage");
+    const loading = document.getElementById("wmsPreviewLoading");
+    if (!preview || !image || !loading) {
+        setInfo("Vista WMS interna non disponibile.");
+        return;
+    }
+
+    loading.textContent = "Caricamento...";
+    loading.hidden = false;
+    image.hidden = true;
+    image.onload = () => {
+        loading.hidden = true;
+        image.hidden = false;
+        setInfo(`Vista WMS caricata con ${layers.length} layer.`);
+    };
+    image.onerror = () => {
+        loading.textContent = "Il servizio WMS non ha restituito l'immagine. Riprova tra poco.";
+        setInfo("Vista WMS non disponibile.");
+    };
+    preview.hidden = false;
+    image.src = `${cadastreUrl()}${params}`;
+}
+
+function closeCadastrePreview() {
+    const preview = document.getElementById("wmsPreview");
+    const image = document.getElementById("wmsPreviewImage");
+    if (preview) {
+        preview.hidden = true;
+    }
+    if (image) {
+        image.onload = null;
+        image.onerror = null;
+        image.removeAttribute("src");
+    }
 }
 
 function bindFileImport() {
@@ -590,6 +682,19 @@ function toggleCadastreLayer(layer, enabled) {
         lmeState.cadastreLayers = lmeState.cadastreLayers.filter(item => item !== layer);
     }
     refreshCadastreLayer();
+    const layerNames = {
+        "CP.CadastralParcel": "Confini particelle",
+        codice_plla: "Numeri particelle",
+        "CP.CadastralZoning": "Fogli catastali",
+        fabbricati: "Fabbricati",
+        strade: "Strade catastali",
+        acque: "Acque"
+    };
+    if (enabled && layer === "codice_plla" && lmeState.map.getZoom() < 17) {
+        setInfo("Numeri particelle attivati. Ingrandisci la mappa almeno fino a zoom 17 per renderli visibili.");
+        return;
+    }
+    setInfo(`${layerNames[layer] || layer}: ${enabled ? "attivo" : "nascosto"}.`);
 }
 
 function refreshCadastreLayer() {
@@ -597,12 +702,14 @@ function refreshCadastreLayer() {
         lmeState.map.removeLayer(lmeState.cadastre);
     }
 
-    if (!lmeState.cadastreLayers.length) {
+    const layers = activeCadastreLayers();
+    lmeState.cadastre = null;
+    if (!layers.length) {
         return;
     }
 
     lmeState.cadastre = L.tileLayer.wms(cadastreUrl(), {
-        layers: lmeState.cadastreLayers.join(","),
+        layers: layers.join(","),
         format: "image/png",
         transparent: true,
         version: "1.3.0",
@@ -613,6 +720,49 @@ function refreshCadastreLayer() {
     }).addTo(lmeState.map);
 }
 
+function activeCadastreLayers() {
+    const drawOrder = [
+        "CP.CadastralZoning",
+        "strade",
+        "acque",
+        "fabbricati",
+        "CP.CadastralParcel",
+        "codice_plla"
+    ];
+    return drawOrder.filter(layer => lmeState.cadastreLayers.includes(layer));
+}
+
+function clearSelectedParcels() {
+    const count = lmeState.selectedParcelsLayer.getLayers().length;
+    lmeState.selectedParcelsLayer.clearLayers();
+    updateGpsInsideState();
+    setInfo(count ? `${count} particelle selezionate rimosse.` : "Non ci sono particelle selezionate da rimuovere.");
+}
+
+function clearMapElements() {
+    const count = lmeState.selectedParcelsLayer.getLayers().length
+        + lmeState.gpsParcelLayer.getLayers().length
+        + lmeState.imported.getLayers().length
+        + lmeState.drawings.getLayers().length
+        + lmeState.gpsTrailPoints.length;
+    if (!count) {
+        setInfo("La mappa non contiene elementi da pulire.");
+        return;
+    }
+    if (!window.confirm("Rimuovere particelle evidenziate, file importati, disegni, POI e traccia GPS dalla mappa?")) {
+        return;
+    }
+
+    lmeState.selectedParcelsLayer.clearLayers();
+    lmeState.gpsParcelLayer.clearLayers();
+    lmeState.imported.clearLayers();
+    lmeState.drawings.clearLayers();
+    lmeState.gpsTrailPoints = [];
+    lmeState.gpsTrail.setLatLngs([]);
+    updateGpsInsideState();
+    setInfo("Elementi della mappa rimossi. Sfondo e layer catastali restano attivi.");
+}
+
 function startGps() {
     if (!navigator.geolocation) {
         setInfo("Geolocalizzazione non disponibile sul dispositivo.");
@@ -711,7 +861,8 @@ function updateGpsInsideState() {
     }
 
     const point = [lmeState.lastPosition[1], lmeState.lastPosition[0]];
-    const officialMatch = findContainingPolygon(point, lmeState.currentParcelLayer.toGeoJSON());
+    const officialMatch = findContainingPolygon(point, lmeState.selectedParcelsLayer.toGeoJSON())
+        || findContainingPolygon(point, lmeState.gpsParcelLayer.toGeoJSON());
     if (officialMatch) {
         const reference = officialMatch.properties?.NATIONALCADASTRALREFERENCE
             || officialMatch.properties?.INSPIREID_LOCALID
@@ -731,7 +882,7 @@ function updateGpsInsideState() {
 
     setText(
         "parcelState",
-        lmeState.currentParcelLayer.getLayers().length
+        lmeState.selectedParcelsLayer.getLayers().length || lmeState.gpsParcelLayer.getLayers().length
             ? "Fuori dalla particella catastale evidenziata"
             : "Fuori dai poligoni caricati");
 }