Separa le misure per ogni oggetto

Components/Pages/Home.razor

@@ -472,6 +472,7 @@
     private bool DrawToolsVisible { get; set; }
     private bool TrailEnabled { get; set; }
     private bool LayerPanelOpen { get; set; }
+    private DotNetObjectReference<Home>? MapCallbackReference { get; set; }
     private bool IncludeCadastralParcels { get; set; } = true;
     private bool IncludeKmlSheetLayer { get; set; }
     private bool ShowImportedSheetLayer { get; set; }
@@ -570,7 +571,8 @@
     {
         if (firstRender)
         {
-            await JS.InvokeVoidAsync("lmeMap.init");
+            MapCallbackReference = DotNetObjectReference.Create(this);
+            await JS.InvokeVoidAsync("lmeMap.init", MapCallbackReference);
             await ApplyFlagPreferencesToMapAsync();
             await CenterOnInitialLocationAsync();
             await MigrateLegacyProjectAsync();
@@ -713,6 +715,10 @@
     private async Task ToggleLayerPanel()
     {
         LayerPanelOpen = !LayerPanelOpen;
+        if (!LayerPanelOpen)
+        {
+            await JS.InvokeVoidAsync("lmeMap.clearLayerManagerSelection");
+        }
         if (LayerPanelOpen)
         {
             ActiveTab = "map";
@@ -1043,6 +1049,21 @@
         await JS.InvokeVoidAsync("lmeMap.setDrawingMeasurementsVisible", ShowDrawingMeasurements);
     }
 
+    [JSInvokable]
+    public Task SetMeasurementsFromLayerManager(string category, bool enabled)
+    {
+        if (category == "imported")
+        {
+            ShowImportedMeasurements = enabled;
+        }
+        else if (category == "drawings")
+        {
+            ShowDrawingMeasurements = enabled;
+        }
+        SaveFlagPreferences();
+        return InvokeAsync(StateHasChanged);
+    }
+
     private async Task ToggleDrawTools()
     {
         DrawToolsVisible = !DrawToolsVisible;
@@ -1499,6 +1520,7 @@
         LocationService.StopTracking();
         GpsLookupCancellation?.Cancel();
         GpsLookupCancellation?.Dispose();
+        MapCallbackReference?.Dispose();
         return ValueTask.CompletedTask;
     }
 }

LMEMappeCatastaliApp.csproj

@@ -28,8 +28,8 @@
         <ApplicationId>com.companyname.lmemappecatastaliapp</ApplicationId>
 
         <!-- Versions -->
-        <ApplicationDisplayVersion>0.2.19</ApplicationDisplayVersion>
+        <ApplicationDisplayVersion>0.2.22</ApplicationDisplayVersion>
-        <ApplicationVersion>23</ApplicationVersion>
+        <ApplicationVersion>26</ApplicationVersion>
 
         <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
         <WindowsPackageType>None</WindowsPackageType>

Services/AzureMapsService.cs

@@ -13,7 +13,7 @@ public sealed class AzureMapsService
 
     public AzureMapsService()
     {
-        _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.19");
+        _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
         _httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/json");
     }
 

Services/NetworkLocationService.cs

@@ -13,7 +13,7 @@ public sealed class NetworkLocationService
 
     public NetworkLocationService()
     {
-        httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.19");
+        httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
     }
 
     public async Task<NetworkLocationSnapshot?> GetApproximateLocationAsync(

wwwroot/css/app.css

@@ -349,11 +349,37 @@ input[type="checkbox"] {
     font-size: 10px;
 }
 
+.layer-manager-suboption {
+    display: grid;
+    grid-template-columns: 18px minmax(0, 1fr);
+    align-items: center;
+    gap: 6px;
+    min-height: 30px;
+    color: var(--ink);
+    font-size: 11px;
+    font-weight: 700;
+}
+
+.layer-manager-suboption input {
+    margin: 0;
+}
+
+.layer-manager-info {
+    display: grid;
+    gap: 2px;
+    padding: 3px 0 0 24px;
+}
+
 .layer-manager-dragging {
     opacity: 0.55;
     outline: 2px solid #2563eb;
 }
 
+.layer-manager-object-selected > summary {
+    background: #fff0fb;
+    box-shadow: inset 3px 0 #ff00d4;
+}
+
 .gps-overlay {
     position: absolute;
     top: 72px;

wwwroot/js/lme-map.js

@@ -51,10 +51,15 @@ const lmeState = {
     managerHighlight: null,
     managerHighlightedObjectId: null,
     managerHighlightedCategoryKey: null,
+    managerOutsideSelectionBound: false,
     managerHiddenObjects: new Map(),
     managerHiddenObjectIds: new Set(),
+    managerHiddenMeasurementSummaryIds: new Set(),
+    managerHiddenMeasurementSideIds: new Set(),
     managerHiddenCategories: new Set(),
-    managerObjectOrder: {}
+    managerObjectOrder: {},
+    managerExpandedRows: new Set(),
+    dotNetReference: null
 };
 
 // AdE publishes the cadastral WMS in ETRS89. WMS 1.1.1 keeps the longitude,
@@ -78,6 +83,7 @@ window.lmeMap = {
     setImportedSheetLayerVisible,
     setLayerOrder,
     refreshLayerManager,
+    clearLayerManagerSelection: clearManagerHighlight,
     setImportedMeasurementsVisible,
     setDrawingMeasurementsVisible,
     addProjectMarker,
@@ -106,7 +112,10 @@ window.lmeMap = {
     showInfo: setInfo
 };
 
-function init() {
+function init(dotNetReference) {
+    if (dotNetReference) {
+        lmeState.dotNetReference = dotNetReference;
+    }
     if (lmeState.map) {
         return;
     }
@@ -190,6 +199,7 @@ function init() {
     }
 
     lmeState.map.on("click", async event => {
+        clearManagerHighlight();
         const info = await queryFeatureInfo(event.latlng);
         if (info) {
             L.popup().setLatLng(event.latlng).setContent(info).openOn(lmeState.map);
@@ -211,6 +221,19 @@ function init() {
             closeCadastrePreview();
         }
     });
+    if (!lmeState.managerOutsideSelectionBound) {
+        document.addEventListener("pointerdown", event => {
+            if (!lmeState.managerHighlightedObjectId) {
+                return;
+            }
+            const selectedRow = event.target?.closest?.(".layer-manager-object");
+            if (selectedRow?.dataset.objectId === lmeState.managerHighlightedObjectId) {
+                return;
+            }
+            clearManagerHighlight();
+        });
+        lmeState.managerOutsideSelectionBound = true;
+    }
 
     setInfo("Mappa pronta: satellite + catasto AdE");
 }
@@ -1164,6 +1187,9 @@ function refreshLayerManager() {
     if (!container || !lmeState.map) {
         return;
     }
+    captureLayerManagerExpansion(container);
+    const scrollHost = container.closest(".map-layer-panel");
+    const scrollTop = scrollHost?.scrollTop || 0;
     applyStoredLayerManagerVisibility();
     container.innerHTML = "";
     lmeState.managerRecords = new Map();
@@ -1184,6 +1210,12 @@ function refreshLayerManager() {
     applyManagedVisualOrder(container);
     bindLayerManagerDrag(container);
     bindLayerManagerMoveButtons(container);
+    if (scrollHost) {
+        scrollHost.scrollTop = scrollTop;
+        window.requestAnimationFrame(() => {
+            scrollHost.scrollTop = scrollTop;
+        });
+    }
 }
 
 function renderLayerManagerCategory(category, records) {
@@ -1191,6 +1223,7 @@ function renderLayerManagerCategory(category, records) {
     group.className = "layer-manager-group";
     group.dataset.dragType = "category";
     group.dataset.categoryKey = category.key;
+    bindLayerManagerExpansion(group, `category:${category.key}`);
     const visibleCount = records.filter(record => !lmeState.managerHiddenObjectIds.has(record.id)).length;
     const categoryVisible = !lmeState.managerHiddenCategories.has(category.key)
         && (!category.roots.length || category.roots.some(layer => lmeState.map.hasLayer(layer)));
@@ -1221,6 +1254,7 @@ function renderLayerManagerBlock(category, source, records) {
     block.dataset.dragType = "block";
     block.dataset.categoryKey = category.key;
     block.dataset.blockKey = source;
+    bindLayerManagerExpansion(block, `block:${category.key}:${source}`);
     const visibleCount = records.filter(record => !lmeState.managerHiddenObjectIds.has(record.id)).length;
     const visible = visibleCount === records.length;
     block.innerHTML = `<summary><button type="button" class="layer-drag-handle" aria-label="Trascina blocco">☰</button><input type="checkbox" ${visible ? "checked" : ""} aria-label="Mostra blocco"><span class="layer-manager-title">${escapeHtml(source)}</span>${layerManagerMoveButtons("blocco")}<span class="layer-manager-count">${records.length}</span></summary><div class="layer-manager-children"></div>`;
@@ -1239,8 +1273,12 @@ function renderLayerManagerBlock(category, source, records) {
 function renderLayerManagerObject(record, index) {
     const object = document.createElement("details");
     object.className = "layer-manager-object";
+    if (record.id === lmeState.managerHighlightedObjectId) {
+        object.classList.add("layer-manager-object-selected");
+    }
     object.dataset.dragType = "object";
     object.dataset.objectId = record.id;
+    bindLayerManagerExpansion(object, `object:${record.id}`);
     const visible = !lmeState.managerHiddenObjectIds.has(record.id);
     object.innerHTML = `<summary><button type="button" class="layer-drag-handle" aria-label="Trascina oggetto">☰</button><input type="checkbox" ${visible ? "checked" : ""} aria-label="Mostra oggetto"><span class="layer-manager-title">${escapeHtml(managedObjectLabel(record, index))}</span>${layerManagerMoveButtons("oggetto")}<span class="layer-manager-count">›</span></summary><div class="layer-manager-details"></div>`;
     const checkbox = object.querySelector("input");
@@ -1253,13 +1291,137 @@ function renderLayerManagerObject(record, index) {
         highlightManagedObject(record);
     });
     const details = object.querySelector(".layer-manager-details");
+    details.appendChild(renderLayerManagerVisibilityOption(
+        geometryVisibilityLabel(record.layer),
+        visible,
+        checked => setManagedObjectVisible(record, checked, true)));
+    if (supportsManagedMeasurements(record)) {
+        managedMeasurementKinds(record).forEach(kind => {
+            const measurementsVisible = managedMeasurementsGloballyVisible(record.categoryKey)
+                && !managedMeasurementHiddenSet(kind.key).has(record.id);
+            details.appendChild(renderLayerManagerVisibilityOption(
+                kind.label,
+                measurementsVisible,
+                checked => setManagedMeasurementKindVisible(record, kind.key, checked)));
+        });
+    }
     const rows = managedObjectDetails(record.layer);
-    details.innerHTML = rows.length
+    const info = document.createElement("div");
+    info.className = "layer-manager-info";
+    info.innerHTML = rows.length
         ? rows.map(value => `<span>${escapeHtml(value)}</span>`).join("")
         : "<span>Nessuna misura disponibile</span>";
+    details.appendChild(info);
     return object;
 }
 
+function renderLayerManagerVisibilityOption(label, checked, onChange) {
+    const option = document.createElement("label");
+    option.className = "layer-manager-suboption";
+    option.innerHTML = `<input type="checkbox" ${checked ? "checked" : ""}><span>${escapeHtml(label)}</span>`;
+    const checkbox = option.querySelector("input");
+    checkbox.addEventListener("click", event => event.stopPropagation());
+    checkbox.addEventListener("change", () => onChange(checkbox.checked));
+    return option;
+}
+
+function geometryVisibilityLabel(layer) {
+    if (layer instanceof L.Polygon || layer instanceof L.Circle) {
+        return "Area/geometria sulla mappa";
+    }
+    if (layer instanceof L.Polyline) {
+        return "Linea sulla mappa";
+    }
+    return "Punto sulla mappa";
+}
+
+function supportsManagedMeasurements(record) {
+    return ["imported", "drawings"].includes(record.categoryKey)
+        && (record.layer instanceof L.Circle
+            || record.layer instanceof L.Polygon
+            || record.layer instanceof L.Polyline);
+}
+
+function managedMeasurementsGloballyVisible(categoryKey) {
+    return categoryKey === "imported"
+        ? lmeState.showImportedMeasurements
+        : lmeState.showDrawingMeasurements;
+}
+
+function managedMeasurementKinds(record) {
+    if (record.layer instanceof L.Polygon) {
+        return [
+            { key: "summary", label: "Superficie e perimetro sulla mappa" },
+            { key: "sides", label: "Misure dei lati sulla mappa" }
+        ];
+    }
+    if (record.layer instanceof L.Circle) {
+        return [{ key: "summary", label: "Superficie, raggio e circonferenza sulla mappa" }];
+    }
+    return [
+        { key: "summary", label: "Lunghezza totale sulla mappa" },
+        { key: "sides", label: "Misure dei tratti sulla mappa" }
+    ];
+}
+
+function managedMeasurementHiddenSet(kind) {
+    return kind === "sides"
+        ? lmeState.managerHiddenMeasurementSideIds
+        : lmeState.managerHiddenMeasurementSummaryIds;
+}
+
+function setManagedMeasurementKindVisible(record, kind, visible) {
+    const hiddenSet = managedMeasurementHiddenSet(kind);
+    if (visible) {
+        if (!managedMeasurementsGloballyVisible(record.categoryKey)) {
+            lmeState.managerRecords.forEach(candidate => {
+                if (candidate.categoryKey === record.categoryKey
+                    && supportsManagedMeasurements(candidate)) {
+                    lmeState.managerHiddenMeasurementSummaryIds.add(candidate.id);
+                    lmeState.managerHiddenMeasurementSideIds.add(candidate.id);
+                }
+            });
+            if (record.categoryKey === "imported") {
+                lmeState.showImportedMeasurements = true;
+            } else {
+                lmeState.showDrawingMeasurements = true;
+            }
+            void lmeState.dotNetReference?.invokeMethodAsync(
+                "SetMeasurementsFromLayerManager",
+                record.categoryKey,
+                true);
+        }
+        hiddenSet.delete(record.id);
+    } else {
+        hiddenSet.add(record.id);
+    }
+    refreshImportedMeasurements();
+    refreshDrawingMeasurements();
+    refreshLayerManager();
+}
+
+function captureLayerManagerExpansion(container) {
+    container.querySelectorAll("details[data-expansion-key]").forEach(row => {
+        if (row.open) {
+            lmeState.managerExpandedRows.add(row.dataset.expansionKey);
+        } else {
+            lmeState.managerExpandedRows.delete(row.dataset.expansionKey);
+        }
+    });
+}
+
+function bindLayerManagerExpansion(row, key) {
+    row.dataset.expansionKey = key;
+    row.open = lmeState.managerExpandedRows.has(key);
+    row.addEventListener("toggle", () => {
+        if (row.open) {
+            lmeState.managerExpandedRows.add(key);
+        } else {
+            lmeState.managerExpandedRows.delete(key);
+        }
+    });
+}
+
 function setManagedCategoryVisible(category, visible) {
     if (category.key === "imported") {
         lmeState.importedVisible = visible;
@@ -1343,9 +1505,16 @@ function managedCategoryEnabled(categoryKey) {
 }
 
 function highlightManagedObject(record) {
-    lmeState.managerHighlight.clearLayers();
+    if (lmeState.managerHighlightedObjectId === record.id) {
+        clearManagerHighlight();
+        return;
+    }
+    clearManagerHighlight();
     lmeState.managerHighlightedObjectId = record.id;
     lmeState.managerHighlightedCategoryKey = record.categoryKey;
+    document.querySelectorAll(".layer-manager-object").forEach(row => {
+        row.classList.toggle("layer-manager-object-selected", row.dataset.objectId === record.id);
+    });
     const geojson = record.layer.toGeoJSON?.();
     if (geojson) {
         L.geoJSON(geojson, {
@@ -1370,6 +1539,9 @@ function clearManagerHighlight() {
     lmeState.managerHighlight?.clearLayers();
     lmeState.managerHighlightedObjectId = null;
     lmeState.managerHighlightedCategoryKey = null;
+    document.querySelectorAll(".layer-manager-object-selected").forEach(row => {
+        row.classList.remove("layer-manager-object-selected");
+    });
 }
 
 function layerManagerMoveButtons(label) {
@@ -1595,6 +1767,7 @@ function applyImportedSheetVisibility() {
 function setImportedMeasurementsVisible(enabled) {
     lmeState.showImportedMeasurements = Boolean(enabled);
     refreshImportedMeasurements();
+    refreshLayerManager();
     setInfo(lmeState.showImportedMeasurements
         ? "Misure dei file GIS visibili."
         : "Misure dei file GIS nascoste.");
@@ -1603,6 +1776,7 @@ function setImportedMeasurementsVisible(enabled) {
 function setDrawingMeasurementsVisible(enabled) {
     lmeState.showDrawingMeasurements = Boolean(enabled);
     refreshDrawingMeasurements();
+    refreshLayerManager();
     setInfo(lmeState.showDrawingMeasurements
         ? "Misure dei disegni visibili."
         : "Misure dei disegni nascoste.");
@@ -1872,15 +2046,27 @@ function renderMeasurements(sourceGroup, targetGroup, visible, sourceType) {
         sourceType
     };
     visitMeasurableLayers(sourceGroup, layer => {
+        const categoryKey = sourceType === "imported" ? "imported" : "drawings";
+        const objectId = managedLayerId(layer, categoryKey);
+        const showSummary = !lmeState.managerHiddenMeasurementSummaryIds.has(objectId);
+        const showSides = !lmeState.managerHiddenMeasurementSideIds.has(objectId);
+        if (!showSummary && !showSides) {
+            return;
+        }
         if (context.count >= context.max || !layerIsInView(layer, context.bounds)) {
             return;
         }
+        const layerContext = {
+            ...context,
+            showSummary,
+            showSides: context.showSides && showSides
+        };
         if (layer instanceof L.Circle) {
-            renderCircleMeasurement(layer, targetGroup, context);
+            renderCircleMeasurement(layer, targetGroup, layerContext);
         } else if (layer instanceof L.Polygon) {
-            renderPolygonMeasurement(layer, targetGroup, context);
+            renderPolygonMeasurement(layer, targetGroup, layerContext);
         } else if (layer instanceof L.Polyline) {
-            renderPolylineMeasurement(layer, targetGroup, context);
+            renderPolylineMeasurement(layer, targetGroup, layerContext);
         }
     });
 }
@@ -1907,6 +2093,9 @@ function layerIsInView(layer, mapBounds) {
 }
 
 function renderCircleMeasurement(layer, targetGroup, context) {
+    if (!context.showSummary) {
+        return;
+    }
     const radius = layer.getRadius();
     const area = Math.PI * radius * radius;
     const circumference = 2 * Math.PI * radius;
@@ -1935,6 +2124,7 @@ function renderPolygonMeasurement(layer, targetGroup, context) {
     const center = typeof layer.getCenter === "function"
         ? layer.getCenter()
         : layer.getBounds().getCenter();
+    if (context.showSummary) {
         addMeasurementLabel(
             targetGroup,
             center,
@@ -1942,6 +2132,7 @@ function renderPolygonMeasurement(layer, targetGroup, context) {
             "summary",
             context);
     }
+}
 
 function renderPolylineMeasurement(layer, targetGroup, context) {
     const lines = lineLatLngGroups(layer.getLatLngs());
@@ -1950,7 +2141,7 @@ function renderPolylineMeasurement(layer, targetGroup, context) {
         lines.forEach(line => addSegmentLabels(line, false, targetGroup, context));
     }
     const longest = lines.reduce((current, line) => line.length > current.length ? line : current, []);
-    if (longest.length) {
+    if (context.showSummary && longest.length) {
         addMeasurementLabel(
             targetGroup,
             longest[Math.floor(longest.length / 2)],
@@ -2297,6 +2488,8 @@ function captureDisplayOptions() {
         layerOrder: [...lmeState.layerOrder],
         layerObjectOrder: { ...lmeState.managerObjectOrder },
         hiddenLayerObjects: [...lmeState.managerHiddenObjectIds],
+        hiddenLayerMeasurementSummaries: [...lmeState.managerHiddenMeasurementSummaryIds],
+        hiddenLayerMeasurementSides: [...lmeState.managerHiddenMeasurementSideIds],
         hiddenLayerCategories: [...lmeState.managerHiddenCategories],
         trailEnabled: lmeState.gpsTrailEnabled
     };
@@ -2333,6 +2526,12 @@ function applyProjectDisplayOptions(options) {
     if (Array.isArray(options.hiddenLayerObjects)) {
         lmeState.managerHiddenObjectIds = new Set(options.hiddenLayerObjects);
     }
+    if (Array.isArray(options.hiddenLayerMeasurementSummaries)) {
+        lmeState.managerHiddenMeasurementSummaryIds = new Set(options.hiddenLayerMeasurementSummaries);
+    }
+    if (Array.isArray(options.hiddenLayerMeasurementSides)) {
+        lmeState.managerHiddenMeasurementSideIds = new Set(options.hiddenLayerMeasurementSides);
+    }
     if (Array.isArray(options.hiddenLayerCategories)) {
         lmeState.managerHiddenCategories = new Set(options.hiddenLayerCategories);
     }
@@ -2416,12 +2615,21 @@ function managedGroupGeoJson(group, categoryKey) {
 function resetLayerManagerProjectState() {
     lmeState.managerHiddenObjects.clear();
     lmeState.managerHiddenObjectIds.clear();
+    lmeState.managerHiddenMeasurementSummaryIds.clear();
+    lmeState.managerHiddenMeasurementSideIds.clear();
     lmeState.managerHiddenCategories.clear();
     lmeState.managerObjectOrder = {};
     clearManagerHighlight();
 }
 
 function clearManagedCategoryState(categoryKey) {
+    const category = layerManagerCategories().find(item => item.key === categoryKey);
+    if (category) {
+        managedRecordsForCategory(category).forEach(record => {
+            lmeState.managerHiddenMeasurementSummaryIds.delete(record.id);
+            lmeState.managerHiddenMeasurementSideIds.delete(record.id);
+        });
+    }
     [...lmeState.managerHiddenObjects.entries()].forEach(([id, record]) => {
         if (record.categoryKey === categoryKey) {
             lmeState.managerHiddenObjects.delete(id);