Separa le misure per ogni oggetto

Components/Pages/Home.razor

@@ -61,10 +61,24 @@
                 <label class="map-layer-option">
                     <input type="checkbox" @bind="ShowSelectedParcels" @bind:after="ApplySelectedParcelsVisibility" />
                     <span>
-                        <strong>Particelle selezionate</strong>
-                        <small>Nascondi o mostra senza eliminare i dati</small>
+                        <strong>Particelle catastali evidenziate</strong>
+                        <small>Contorni rossi ottenuti da ricerca o GPS</small>
                     </span>
                 </label>
+                <label class="map-layer-option">
+                    <input type="checkbox" @bind="ShowImportedData" @bind:after="ApplyImportedDataVisibility" />
+                    <span>
+                        <strong>Dati importati</strong>
+                        <small>Particelle e geometrie verdi di file e progetti</small>
+                    </span>
+                </label>
+                <section class="layer-tree-section">
+                    <header>
+                        <strong>Ordine livelli e oggetti</strong>
+                        <small>Trascina dall'alto verso il basso</small>
+                    </header>
+                    <div id="layerManagerTree" class="layer-manager-tree"></div>
+                </section>
                 <div class="layer-panel-actions">
                     <button class="danger-command" @onclick="ClearSelectedParcels">Elimina definitivamente le particelle selezionate</button>
                     <button class="danger-command" @onclick="ClearMapElements">Pulisci elementi mappa</button>
@@ -176,6 +190,10 @@
                                     ? "Attivato: importa foglio, particelle e altri elementi KML/KMZ."
                                     : "Disattivato: importa solo i poligoni delle particelle riconosciute.")
                             </small>
+                            <label class="toggle-line project-save-option">
+                                <input type="checkbox" @bind="ShowImportedData" @bind:after="ApplyImportedDataVisibility" />
+                                <span>Mostra particelle/dati importati in verde</span>
+                            </label>
                             <label class="toggle-line project-save-option">
                                 <input type="checkbox" @bind="ShowImportedSheetLayer" @bind:after="ApplyImportedSheetLayerVisibility" />
                                 <span>Mostra cornice/layer del foglio importato</span>
@@ -301,6 +319,10 @@
 
                         <section class="panel-section">
                             <h2>Visualizzazione progetto</h2>
+                            <label class="toggle-line project-save-option">
+                                <input type="checkbox" @bind="ShowImportedData" @bind:after="ApplyImportedDataVisibility" />
+                                <span>Mostra particelle/dati importati in verde</span>
+                            </label>
                             <label class="toggle-line project-save-option">
                                 <input type="checkbox" @bind="ShowImportedSheetLayer" @bind:after="ApplyImportedSheetLayerVisibility" />
                                 <span>Mostra cornice/layer del foglio importato</span>
@@ -446,9 +468,11 @@
     private bool GpsActive { get; set; }
     private bool ShowGpsPosition { get; set; } = true;
     private bool ShowSelectedParcels { get; set; } = true;
+    private bool ShowImportedData { get; set; } = true;
     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; }
@@ -547,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();
@@ -681,11 +706,19 @@
         }
         await Task.Delay(30);
         await JS.InvokeVoidAsync("lmeMap.resize");
+        if (LayerPanelOpen)
+        {
+            await JS.InvokeVoidAsync("lmeMap.refreshLayerManager");
+        }
     }
 
     private async Task ToggleLayerPanel()
     {
         LayerPanelOpen = !LayerPanelOpen;
+        if (!LayerPanelOpen)
+        {
+            await JS.InvokeVoidAsync("lmeMap.clearLayerManagerSelection");
+        }
         if (LayerPanelOpen)
         {
             ActiveTab = "map";
@@ -693,6 +726,10 @@
 
         await Task.Delay(30);
         await JS.InvokeVoidAsync("lmeMap.resize");
+        if (LayerPanelOpen)
+        {
+            await JS.InvokeVoidAsync("lmeMap.refreshLayerManager");
+        }
     }
 
     private async Task SearchLocation()
@@ -1012,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;
@@ -1175,6 +1227,7 @@
         SelectedBaseLayer = options.BaseLayer;
         CadastralOpacity = options.CadastreOpacity;
         IncludeKmlSheetLayer = options.IncludeKmlSheetLayer;
+        ShowImportedData = options.ImportedVisible;
         ShowImportedSheetLayer = options.ImportedSheetsVisible;
         ShowImportedMeasurements = options.ShowImportedMeasurements;
         ShowDrawingMeasurements = options.ShowDrawingMeasurements;
@@ -1336,6 +1389,7 @@
     {
         IncludeCadastralParcels = GetFlagPreference("include_cadastral_parcels", true);
         IncludeKmlSheetLayer = GetFlagPreference("include_kml_sheet_layer", false);
+        ShowImportedData = GetFlagPreference("show_imported_data", true);
         ShowImportedSheetLayer = GetFlagPreference("show_imported_sheet_layer", false);
         ShowImportedMeasurements = GetFlagPreference("show_imported_measurements", false);
         ShowDrawingMeasurements = GetFlagPreference("show_drawing_measurements", true);
@@ -1360,6 +1414,7 @@
     {
         SetFlagPreference("include_cadastral_parcels", IncludeCadastralParcels);
         SetFlagPreference("include_kml_sheet_layer", IncludeKmlSheetLayer);
+        SetFlagPreference("show_imported_data", ShowImportedData);
         SetFlagPreference("show_imported_sheet_layer", ShowImportedSheetLayer);
         SetFlagPreference("show_imported_measurements", ShowImportedMeasurements);
         SetFlagPreference("show_drawing_measurements", ShowDrawingMeasurements);
@@ -1383,6 +1438,7 @@
     private async Task ApplyFlagPreferencesToMapAsync()
     {
         await JS.InvokeVoidAsync("lmeMap.setIncludeKmlSheetLayer", IncludeKmlSheetLayer);
+        await JS.InvokeVoidAsync("lmeMap.setImportedLayerVisible", ShowImportedData);
         await JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer);
         await JS.InvokeVoidAsync("lmeMap.setImportedMeasurementsVisible", ShowImportedMeasurements);
         await JS.InvokeVoidAsync("lmeMap.setDrawingMeasurementsVisible", ShowDrawingMeasurements);
@@ -1409,6 +1465,12 @@
         await JS.InvokeVoidAsync("lmeMap.setSelectedParcelsVisible", ShowSelectedParcels);
     }
 
+    private async Task ApplyImportedDataVisibility()
+    {
+        SaveFlagPreferences();
+        await JS.InvokeVoidAsync("lmeMap.setImportedLayerVisible", ShowImportedData);
+    }
+
     private async Task ExportCadastralImage()
     {
         ActiveTab = "map";
@@ -1442,6 +1504,7 @@
         public double CadastreOpacity { get; init; } = 0.75;
         public string[] CadastreLayers { get; init; } = [];
         public bool IncludeKmlSheetLayer { get; init; }
+        public bool ImportedVisible { get; init; } = true;
         public bool ImportedSheetsVisible { get; init; }
         public bool ShowImportedMeasurements { get; init; }
         public bool ShowDrawingMeasurements { get; init; } = true;
@@ -1457,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.17</ApplicationDisplayVersion>
-        <ApplicationVersion>21</ApplicationVersion>
+        <ApplicationDisplayVersion>0.2.22</ApplicationDisplayVersion>
+        <ApplicationVersion>26</ApplicationVersion>
 
         <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
         <WindowsPackageType>None</WindowsPackageType>
@@ -44,7 +44,7 @@
 
     <ItemGroup>
         <!-- App Icon -->
-        <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+        <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#075E54" />
 
         <!-- Splash Screen -->
         <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />

Resources/AppIcon/appicon.svg

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <rect x="0" y="0" width="456" height="456" fill="#512BD4" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="456" height="456" viewBox="0 0 456 456" xmlns="http://www.w3.org/2000/svg">
+    <rect width="456" height="456" fill="#075E54" />
 </svg>

Resources/AppIcon/appiconfg.svg

@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-    <path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-    <path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-    <path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="456" height="456" viewBox="0 0 456 456" xmlns="http://www.w3.org/2000/svg">
+    <g stroke-linecap="round" stroke-linejoin="round">
+        <path d="M105 150L183 119L273 151L351 120V307L273 338L183 306L105 337Z"
+              fill="#F7FAF5" stroke="#E1ECE5" stroke-width="10" />
+        <path d="M183 119V306M273 151V338" fill="none" stroke="#83B6A5" stroke-width="10" />
+        <path d="M125 190L162 175M124 274L160 260M293 196L330 181M295 282L330 268"
+              fill="none" stroke="#A9CDBE" stroke-width="9" />
+        <path d="M228 104C188 104 157 135 157 175C157 225 228 294 228 294C228 294 299 225 299 175C299 135 268 104 228 104Z"
+              fill="#F97316" stroke="#FFFFFF" stroke-width="12" />
+        <circle cx="228" cy="175" r="24" fill="#FFFFFF" />
+    </g>
 </svg>

Services/AzureMapsService.cs

@@ -13,7 +13,7 @@ public sealed class AzureMapsService
 
     public AzureMapsService()
     {
-        _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.17");
+        _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.17");
+        httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
     }
 
     public async Task<NetworkLocationSnapshot?> GetApproximateLocationAsync(

wwwroot/css/app.css

@@ -239,6 +239,147 @@ input[type="checkbox"] {
     padding-top: 9px;
 }
 
+.layer-tree-section {
+    display: grid;
+    gap: 6px;
+    padding-top: 9px;
+}
+
+.layer-tree-section > header {
+    display: grid;
+    gap: 2px;
+    padding: 0 4px;
+}
+
+.layer-tree-section > header small {
+    color: var(--muted);
+    font-size: 10px;
+}
+
+.layer-manager-tree,
+.layer-manager-children {
+    display: grid;
+    gap: 4px;
+}
+
+.layer-manager-group,
+.layer-manager-block,
+.layer-manager-object {
+    border: 1px solid #dce3e6;
+    border-radius: 6px;
+    background: #fff;
+}
+
+.layer-manager-group > summary,
+.layer-manager-block > summary,
+.layer-manager-object > summary {
+    display: grid;
+    grid-template-columns: 28px 20px minmax(0, 1fr) auto auto;
+    align-items: center;
+    gap: 6px;
+    min-height: 38px;
+    padding: 4px 6px;
+    cursor: pointer;
+    list-style: none;
+}
+
+.layer-manager-group > summary::-webkit-details-marker,
+.layer-manager-block > summary::-webkit-details-marker,
+.layer-manager-object > summary::-webkit-details-marker {
+    display: none;
+}
+
+.layer-drag-handle {
+    width: 28px;
+    height: 28px;
+    border: 0;
+    border-radius: 4px;
+    background: #e9eef0;
+    color: var(--ink);
+    font-size: 18px;
+    line-height: 1;
+    touch-action: none;
+    cursor: grab;
+}
+
+.layer-move-buttons {
+    display: inline-grid;
+    grid-template-columns: 24px 24px;
+    gap: 2px;
+}
+
+.layer-move-buttons button {
+    width: 24px;
+    height: 28px;
+    padding: 0;
+    border: 1px solid #cbd5da;
+    border-radius: 4px;
+    background: #f6f8f9;
+    color: var(--ink);
+    font-size: 16px;
+    font-weight: 800;
+    line-height: 1;
+}
+
+.layer-move-buttons button:active {
+    background: #dce8ec;
+}
+
+.layer-manager-title {
+    min-width: 0;
+    overflow-wrap: anywhere;
+    font-size: 12px;
+    font-weight: 700;
+}
+
+.layer-manager-count {
+    color: var(--muted);
+    font-size: 10px;
+}
+
+.layer-manager-children {
+    padding: 0 5px 5px 18px;
+}
+
+.layer-manager-details {
+    display: grid;
+    gap: 2px;
+    padding: 0 8px 7px 40px;
+    color: var(--muted);
+    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;