Fix cadastral layer controls and WMS preview

Add Azure Maps road and satellite layers
2026-09-11 20:31:04 +02:00 · 2026-09-11 19:53:28 +02:00
7 changed files with 701 additions and 40 deletions
@@ -4,6 +4,7 @@
@inject CadastralCatalogService CatalogService
@inject OfficialCadastreService OfficialCadastreService
@inject LocationSearchService LocationSearchService
+@inject AzureMapsService AzureMapsService
@implements IAsyncDisposable

 <PageTitle>LME Mappe Catastali</PageTitle>
@@ -17,7 +18,16 @@
                <strong>LME Catasto</strong>
                <span>@Status</span>
            </div>
-            <button class="toolbar-button" @onclick='() => SelectTab(ActiveTab == "search" ? "map" : "search")'>Cerca</button>
+            <div class="toolbar-actions">
+                <button class="toolbar-button layer-button @(LayerPanelOpen ? "is-active" : null)"
+                        title="Layer catastali"
+                        aria-expanded="@LayerPanelOpen"
+                        @onclick="ToggleLayerPanel">
+                    <span class="layer-symbol" aria-hidden="true"></span>
+                    <span>Layer</span>
+                </button>
+                <button class="toolbar-button" @onclick='() => SelectTab(ActiveTab == "search" ? "map" : "search")'>Cerca</button>
+            </div>
        </header>

        <div class="map-search @(ActiveTab == "search" ? "is-open" : null)">
@@ -25,6 +35,33 @@
            <button @onclick="SearchLocation">Vai</button>
        </div>

+        @if (LayerPanelOpen)
+        {
+            <section class="map-layer-panel" aria-label="Layer catastali">
+                <header>
+                    <strong>Layer catastali</strong>
+                    <button class="layer-panel-close" aria-label="Chiudi layer" @onclick="ToggleLayerPanel">×</button>
+                </header>
+                @foreach (var layer in CadastralLayers)
+                {
+                    <label class="map-layer-option">
+                        <input type="checkbox" checked="@layer.Enabled" @onchange="(args) => ToggleCadastreLayer(layer, args)" />
+                        <span>
+                            <strong>@layer.Name</strong>
+                            @if (!string.IsNullOrWhiteSpace(layer.Detail))
+                            {
+                                <small>@layer.Detail</small>
+                            }
+                        </span>
+                    </label>
+                }
+                <div class="layer-panel-actions">
+                    <button class="secondary-command" @onclick="ClearSelectedParcels">Rimuovi particelle selezionate</button>
+                    <button class="danger-command" @onclick="ClearMapElements">Pulisci elementi mappa</button>
+                </div>
+            </section>
+        }
+
        <div class="gps-overlay @(ActiveTab == "search" ? "search-open" : null)">
            <div class="gps-state">
                <span id="gpsState">GPS non attivo</span>
@@ -153,6 +190,8 @@
                                <option value="topographic">Topografica - Esri World Topographic</option>
                                <option value="terrain">Terreno - OpenTopoMap</option>
                                <option value="carto">Strade chiare - CARTO Voyager</option>
+                                <option value="azure-road">Strade - Azure Maps</option>
+                                <option value="azure-satellite">Satellite - Azure Maps</option>
                                <option value="google-satellite">Satellite - Google Maps</option>
                                <option value="google-roadmap">Strade - Google Maps</option>
                            </select>
@@ -162,20 +201,19 @@
                            <input type="password" @bind="GoogleMapsApiKey" placeholder="API key" autocomplete="off" />
                        </label>
                        <button class="secondary-command" @onclick="SaveGoogleMapsApiKey">Salva chiave Google</button>
+                        <label>
+                            Chiave sottoscrizione Azure Maps Gen2
+                            <input type="password" @bind="AzureMapsSubscriptionKey" placeholder="Subscription key" autocomplete="off" />
+                        </label>
+                        <button class="secondary-command" @onclick="SaveAzureMapsKey">Salva chiave Azure Maps</button>
+                        <div class="service-note">
+                            <strong>Quota gratuita Azure Maps Gen2</strong>
+                            <p>Include ogni mese 5.000 transazioni per le mappe stradali e 1.000 per le immagini satellitari. Ogni transazione comprende fino a 15 tessere.</p>
+                        </div>
                        <label>
                            Trasparenza catasto
                            <input type="range" min="0" max="1" step="0.05" value="0.75" @onchange="ChangeCadastreOpacity" />
                        </label>
-                        <div class="layer-toggles">
-                            @foreach (var layer in CadastralLayers)
-                            {
-                                <label>
-                                    <input type="checkbox" checked="@layer.Enabled" @onchange="(args) => ToggleCadastreLayer(layer.Key, args)" />
-                                    @layer.Name
-                                </label>
-                            }
-                        </div>
-
                        <h2>GPS e percorso</h2>
                        <label class="toggle-line">
                            <input type="checkbox" checked="@TrailEnabled" @onchange="ToggleTrail" />
@@ -190,7 +228,7 @@
                            <button class="secondary-command" @onclick="OpenOfficialReservedArea">Apri Area riservata per download</button>
                        </div>

-                        <button class="secondary-command" @onclick="ExportCadastralImage">Apri vista WMS corrente</button>
+                        <button class="secondary-command" @onclick="ExportCadastralImage">Mostra vista WMS corrente</button>
                        <footer>Dati catastali: Agenzia delle Entrate, licenza CC BY 4.0. App indipendente.</footer>
                    </section>
                }
@@ -199,6 +237,22 @@

        <div id="mapInfo" class="map-info">Pronto</div>

+        <div id="wmsPreview" class="wms-preview" hidden>
+            <section class="wms-preview-dialog" role="dialog" aria-modal="true" aria-labelledby="wmsPreviewTitle">
+                <header>
+                    <div>
+                        <strong id="wmsPreviewTitle">Vista WMS catastale</strong>
+                        <small>Immagine ufficiale AdE dell'area visibile, senza mappa di sfondo</small>
+                    </div>
+                    <button id="closeWmsPreview" class="close-button" aria-label="Chiudi vista WMS">×</button>
+                </header>
+                <div class="wms-preview-body">
+                    <span id="wmsPreviewLoading">Caricamento...</span>
+                    <img id="wmsPreviewImage" alt="Vista WMS catastale dell'area corrente" />
+                </div>
+            </section>
+        </div>
+
        <nav class="bottom-tabs" aria-label="Sezioni principali">
            <button class="@(ActiveTab == "map" || ActiveTab == "search" ? "active" : null)" @onclick='() => SelectTab("map")'>Mappa</button>
            <button class="@(ActiveTab == "cadastre" ? "active" : null)" @onclick='() => SelectTab("cadastre")'>Catasto</button>
@@ -215,6 +269,7 @@
    private string Status { get; set; } = "online";
    private string SelectedBaseLayer { get; set; } = "satellite";
    private string GoogleMapsApiKey { get; set; } = string.Empty;
+    private string AzureMapsSubscriptionKey { get; set; } = string.Empty;
    private string SelectedRegionFile { get; set; } = string.Empty;
    private string SelectedMunicipalityCode { get; set; } = string.Empty;
    private string SelectedSheet { get; set; } = string.Empty;
@@ -225,6 +280,7 @@
    private bool GpsActive { get; set; }
    private bool DrawToolsVisible { get; set; }
    private bool TrailEnabled { get; set; }
+    private bool LayerPanelOpen { get; set; }
    private CancellationTokenSource? CatalogCancellation { get; set; }
    private CancellationTokenSource? GpsLookupCancellation { get; set; }
    private long LastGpsLookupAt;
@@ -259,11 +315,11 @@

    private readonly List<CadastralLayer> CadastralLayers =
    [
-        new("CP.CadastralParcel", "Particelle", true),
-        new("codice_plla", "Numeri particelle", true),
-        new("CP.CadastralZoning", "Fogli", true),
+        new("CP.CadastralParcel", "Confini particelle", true),
+        new("codice_plla", "Numeri particelle", true, "Visibili circa da zoom 17"),
+        new("CP.CadastralZoning", "Fogli catastali", true),
        new("fabbricati", "Fabbricati", true),
-        new("strade", "Strade", false),
+        new("strade", "Strade catastali", false),
        new("acque", "Acque", false)
    ];

@@ -278,6 +334,15 @@
            GoogleMapsApiKey = string.Empty;
        }

+        try
+        {
+            AzureMapsSubscriptionKey = await SecureStorage.Default.GetAsync("azure_maps_subscription_key") ?? string.Empty;
+        }
+        catch
+        {
+            AzureMapsSubscriptionKey = string.Empty;
+        }
+
        try
        {
            Regions = await CatalogService.GetRegionsAsync();
@@ -299,6 +364,22 @@
    private async Task SelectTab(string tab)
    {
        ActiveTab = tab;
+        if (tab != "map")
+        {
+            LayerPanelOpen = false;
+        }
+        await Task.Delay(30);
+        await JS.InvokeVoidAsync("lmeMap.resize");
+    }
+
+    private async Task ToggleLayerPanel()
+    {
+        LayerPanelOpen = !LayerPanelOpen;
+        if (LayerPanelOpen)
+        {
+            ActiveTab = "map";
+        }
+
        await Task.Delay(30);
        await JS.InvokeVoidAsync("lmeMap.resize");
    }
@@ -618,6 +699,18 @@
                await JS.InvokeVoidAsync("lmeMap.configureGoogleMaps", GoogleMapsApiKey.Trim());
            }

+            if (requestedLayer.StartsWith("azure-", StringComparison.Ordinal))
+            {
+                if (string.IsNullOrWhiteSpace(AzureMapsSubscriptionKey))
+                {
+                    await JS.InvokeVoidAsync("lmeMap.showInfo", "Inserisci e salva la chiave della sottoscrizione Azure Maps.");
+                    return;
+                }
+
+                await AzureMapsService.ValidateKeyAsync(AzureMapsSubscriptionKey);
+                await JS.InvokeVoidAsync("lmeMap.configureAzureMaps", AzureMapsSubscriptionKey.Trim());
+            }
+
            await JS.InvokeVoidAsync("lmeMap.setBaseLayer", requestedLayer);
            SelectedBaseLayer = requestedLayer;
        }
@@ -648,9 +741,54 @@
            await JS.InvokeVoidAsync("lmeMap.showInfo", $"Chiave Google non salvata: {error.Message}");
        }
    }
+
+    private async Task SaveAzureMapsKey()
+    {
+        try
+        {
+            if (string.IsNullOrWhiteSpace(AzureMapsSubscriptionKey))
+            {
+                SecureStorage.Default.Remove("azure_maps_subscription_key");
+                await JS.InvokeVoidAsync("lmeMap.clearAzureMaps");
+                if (SelectedBaseLayer.StartsWith("azure-", StringComparison.Ordinal))
+                {
+                    SelectedBaseLayer = "satellite";
+                }
+                await JS.InvokeVoidAsync("lmeMap.showInfo", "Chiave Azure Maps rimossa.");
+                return;
+            }
+
+            AzureMapsSubscriptionKey = AzureMapsSubscriptionKey.Trim();
+            await AzureMapsService.ValidateKeyAsync(AzureMapsSubscriptionKey);
+            await SecureStorage.Default.SetAsync("azure_maps_subscription_key", AzureMapsSubscriptionKey);
+            await JS.InvokeVoidAsync("lmeMap.configureAzureMaps", AzureMapsSubscriptionKey);
+            await JS.InvokeVoidAsync("lmeMap.showInfo", "Chiave Azure Maps valida e salvata sul dispositivo.");
+        }
+        catch (Exception error)
+        {
+            await JS.InvokeVoidAsync("lmeMap.showInfo", $"Chiave Azure Maps non salvata: {error.GetBaseException().Message}");
+        }
+    }
    private Task ChangeCadastreOpacity(ChangeEventArgs args) => JS.InvokeVoidAsync("lmeMap.setCadastreOpacity", args.Value?.ToString()).AsTask();
-    private Task ToggleCadastreLayer(string layer, ChangeEventArgs args) => JS.InvokeVoidAsync("lmeMap.toggleCadastreLayer", layer, (bool?)args.Value == true).AsTask();
-    private Task ExportCadastralImage() => JS.InvokeVoidAsync("lmeMap.exportCadastreView").AsTask();
+
+    private async Task ToggleCadastreLayer(CadastralLayer layer, ChangeEventArgs args)
+    {
+        layer.Enabled = args.Value is true;
+        await JS.InvokeVoidAsync("lmeMap.toggleCadastreLayer", layer.Key, layer.Enabled);
+    }
+
+    private async Task ExportCadastralImage()
+    {
+        ActiveTab = "map";
+        LayerPanelOpen = false;
+        await Task.Delay(30);
+        await JS.InvokeVoidAsync("lmeMap.resize");
+        await JS.InvokeVoidAsync("lmeMap.exportCadastreView");
+    }
+
+    private Task ClearSelectedParcels() => JS.InvokeVoidAsync("lmeMap.clearSelectedParcels").AsTask();
+
+    private Task ClearMapElements() => JS.InvokeVoidAsync("lmeMap.clearMapElements").AsTask();

    private Task OpenOfficialGeoportal() => Microsoft.Maui.ApplicationModel.Launcher.Default.OpenAsync(
        new Uri("https://geoportale.cartografia.agenziaentrate.gov.it/"));
@@ -658,7 +796,13 @@
    private Task OpenOfficialReservedArea() => Microsoft.Maui.ApplicationModel.Launcher.Default.OpenAsync(
        new Uri("https://www.agenziaentrate.gov.it/portale/area-riservata"));

-    private sealed record CadastralLayer(string Key, string Name, bool Enabled);
+    private sealed class CadastralLayer(string key, string name, bool enabled, string detail = "")
+    {
+        public string Key { get; } = key;
+        public string Name { get; } = name;
+        public bool Enabled { get; set; } = enabled;
+        public string Detail { get; } = detail;
+    }

    public ValueTask DisposeAsync()
    {
@@ -28,8 +28,8 @@
        <ApplicationId>com.companyname.lmemappecatastaliapp</ApplicationId>

        <!-- Versions -->
-        <ApplicationDisplayVersion>0.2.2</ApplicationDisplayVersion>
-        <ApplicationVersion>6</ApplicationVersion>
+        <ApplicationDisplayVersion>0.2.4</ApplicationDisplayVersion>
+        <ApplicationVersion>8</ApplicationVersion>

        <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
        <WindowsPackageType>None</WindowsPackageType>
@@ -20,6 +20,7 @@ public static class MauiProgram
        builder.Services.AddSingleton<CadastralCatalogService>();
        builder.Services.AddSingleton<OfficialCadastreService>();
        builder.Services.AddSingleton<LocationSearchService>();
+        builder.Services.AddSingleton<AzureMapsService>();

 #if DEBUG
        builder.Services.AddBlazorWebViewDeveloperTools();
@@ -4,7 +4,7 @@ App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata pe

 ## Funzioni gia implementate

- Mappa interattiva Leaflet con sfondi Esri, OpenStreetMap, OpenTopoMap, CARTO Voyager e Google Maps configurabile tramite API key.
+- Mappa interattiva Leaflet con sfondi Esri, OpenStreetMap, OpenTopoMap, CARTO Voyager, Google Maps e Azure Maps configurabili tramite chiave.
 - Layer WMS ufficiale Agenzia delle Entrate: particelle, numeri particella, fogli, fabbricati, strade e acque.
 - Trasparenza configurabile del layer catastale.
 - Interrogazione WMS con click/tap sulla mappa.
@@ -24,6 +24,10 @@ App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata pe
 - Catalogo dei Comuni incluso nell'APK e cataloghi regionali OnData scaricati in cache solo quando servono.
 - Ricerca catastale eseguita dal codice .NET nativo, senza DuckDB WebAssembly nella WebView Android.
 - La registrazione della traccia GPS e' disattivata all'avvio; la toolbar di disegno puo' essere mostrata o nascosta dal tab Progetti.
+- Pannello `Layer` accessibile direttamente dalla mappa, con checkbox sincronizzati per confini, numeri particella, fogli, fabbricati, strade e acque.
+- Le particelle cercate possono essere aggiunte una dopo l'altra, mantenendo contemporaneamente sulla mappa tutti i confini selezionati.
+- Comandi separati per rimuovere le particelle selezionate o pulire importazioni, disegni, POI e traccia GPS.
+- Anteprima WMS ufficiale mostrata dentro l'app senza aprire una nuova finestra Android.
 - Collegamenti separati al Geoportale pubblico e all'Area riservata AdE per CAPTCHA, SPID/CIE e download ufficiali.

 ## Limite ufficiale AdE da considerare
@@ -38,6 +42,21 @@ Questo passaggio e' implementato nel tab `Catasto`. Regione e Comune sono dispon

 I layer cartografici pubblici WMS/WFS sono open data e non richiedono CAPTCHA. Il CAPTCHA o l'autenticazione SPID/CIE appartengono ai servizi web di consultazione e download documentale: l'app li apre nel sito ufficiale dell'Agenzia e non tenta di aggirarli.

+## Azure Maps Gen2
+
+Nel tab `Impostazioni` sono disponibili gli sfondi `Strade - Azure Maps` e `Satellite - Azure Maps`. Per usarli:
+
+1. crea una risorsa Azure Maps con piano Gen2 nel portale Azure;
+2. copia una delle chiavi di sottoscrizione della risorsa;
+3. inseriscila in `Chiave sottoscrizione Azure Maps Gen2` e premi `Salva chiave Azure Maps`.
+
+La chiave viene validata prima del salvataggio e rimane nel `SecureStorage` del dispositivo; non e' inclusa nel codice o nell'APK. Lasciando vuoto il campo e premendo il pulsante, la chiave viene rimossa.
+
+La quota gratuita mensile Gen2 indicata da Microsoft comprende 5.000 transazioni per le mappe di base e 1.000 per le immagini satellitari. Una transazione raggruppa fino a 15 richieste di tessere. Oltre la quota si applicano le condizioni economiche della sottoscrizione Azure, quindi e' opportuno configurare budget e avvisi nel portale.
+
+- Creazione account e autenticazione: https://learn.microsoft.com/azure/azure-maps/how-to-manage-account-keys
+- Prezzi e quota gratuita: https://azure.microsoft.com/pricing/details/azure-maps/
+
 ## Aprire in Visual Studio

 Apri `LMEMappeCatastaliApp.csproj` con Visual Studio 2022/2026 e seleziona:
@@ -0,0 +1,53 @@
+using System.Text.Json;
+
+namespace LMEMappeCatastaliApp.Services;
+
+public sealed class AzureMapsService
+{
+    private const string TilesetEndpoint = "https://atlas.microsoft.com/map/tileset";
+    private readonly HttpClient _httpClient = new()
+    {
+        Timeout = TimeSpan.FromSeconds(20)
+    };
+    private string? _validatedKey;
+
+    public AzureMapsService()
+    {
+        _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.4");
+        _httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/json");
+    }
+
+    public async Task ValidateKeyAsync(string subscriptionKey, CancellationToken cancellationToken = default)
+    {
+        var key = subscriptionKey.Trim();
+        if (string.IsNullOrWhiteSpace(key))
+        {
+            throw new ArgumentException("Chiave Azure Maps mancante.", nameof(subscriptionKey));
+        }
+
+        if (string.Equals(_validatedKey, key, StringComparison.Ordinal))
+        {
+            return;
+        }
+
+        var url = $"{TilesetEndpoint}?api-version=2024-04-01&tilesetId=microsoft.base.road";
+        using var request = new HttpRequestMessage(HttpMethod.Get, url);
+        request.Headers.Add("subscription-key", key);
+        using var response = await _httpClient.SendAsync(request, cancellationToken);
+        if (!response.IsSuccessStatusCode)
+        {
+            throw new InvalidOperationException(response.StatusCode is System.Net.HttpStatusCode.Unauthorized or System.Net.HttpStatusCode.Forbidden
+                ? "Chiave Azure Maps non valida o priva dei permessi Render."
+                : $"Azure Maps ha risposto {((int)response.StatusCode)}.");
+        }
+
+        await using var content = await response.Content.ReadAsStreamAsync(cancellationToken);
+        using var payload = await JsonDocument.ParseAsync(content, cancellationToken: cancellationToken);
+        if (!payload.RootElement.TryGetProperty("tiles", out _))
+        {
+            throw new InvalidDataException("Azure Maps ha restituito una configurazione non valida.");
+        }
+
+        _validatedKey = key;
+    }
+}
@@ -124,6 +124,28 @@ input[type="checkbox"] {
    color: var(--ink);
 }

+.toolbar-actions,
+.layer-button {
+    display: flex;
+    align-items: center;
+    gap: 7px;
+}
+
+.toolbar-actions {
+    flex: 0 0 auto;
+}
+
+.layer-button.is-active {
+    background: #ccebe3;
+    color: var(--accent-strong);
+}
+
+.layer-symbol {
+    width: 20px;
+    height: 20px;
+    background: url("../lib/leaflet/images/layers.png") center / contain no-repeat;
+}
+
 .map-search {
    position: absolute;
    top: 72px;
@@ -150,6 +172,73 @@ input[type="checkbox"] {
    transform: translateY(0);
 }

+.map-layer-panel {
+    position: absolute;
+    top: 72px;
+    right: 12px;
+    z-index: 940;
+    display: grid;
+    width: min(320px, calc(100% - 24px));
+    max-height: calc(100% - 152px);
+    overflow-y: auto;
+    border: 1px solid var(--line);
+    border-radius: 8px;
+    padding: 9px;
+    background: rgba(255, 255, 255, 0.98);
+    box-shadow: 0 3px 14px rgba(0, 0, 0, 0.22);
+}
+
+.map-layer-panel > header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 10px;
+    padding: 0 0 7px 4px;
+    border-bottom: 1px solid var(--line);
+}
+
+.layer-panel-close {
+    width: 36px;
+    min-width: 36px;
+    min-height: 34px;
+    padding: 0;
+    background: #e9eef0;
+    color: var(--ink);
+    font-size: 23px;
+}
+
+.map-layer-option {
+    display: flex;
+    align-items: center;
+    gap: 9px;
+    min-height: 45px;
+    padding: 6px 4px;
+    border-bottom: 1px solid #e5eaed;
+}
+
+.map-layer-option input {
+    flex: 0 0 auto;
+    width: 19px;
+    height: 19px;
+}
+
+.map-layer-option span {
+    display: grid;
+    gap: 2px;
+}
+
+.map-layer-option small {
+    color: var(--muted);
+    font-size: 10px;
+    font-weight: 600;
+}
+
+.layer-panel-actions {
+    display: grid;
+    gap: 7px;
+    padding-top: 9px;
+}
+
 .gps-overlay {
    position: absolute;
    top: 72px;
@@ -384,6 +473,68 @@ label {
    pointer-events: none;
 }

+.wms-preview[hidden] {
+    display: none;
+}
+
+.wms-preview {
+    position: absolute;
+    inset: 0;
+    z-index: 1400;
+    display: grid;
+    place-items: center;
+    padding: 16px;
+    background: rgba(15, 22, 27, 0.72);
+}
+
+.wms-preview-dialog {
+    display: grid;
+    grid-template-rows: auto minmax(0, 1fr);
+    width: min(980px, 100%);
+    height: min(820px, 100%);
+    overflow: hidden;
+    border-radius: 8px;
+    background: #fff;
+    box-shadow: 0 10px 34px rgba(0, 0, 0, 0.34);
+}
+
+.wms-preview-dialog > header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+    padding: 11px 12px;
+    border-bottom: 1px solid var(--line);
+}
+
+.wms-preview-dialog > header div {
+    display: grid;
+    gap: 2px;
+}
+
+.wms-preview-dialog > header small {
+    color: var(--muted);
+    font-size: 10px;
+}
+
+.wms-preview-body {
+    display: grid;
+    min-height: 0;
+    place-items: center;
+    overflow: auto;
+    padding: 12px;
+    background: #eef2f3;
+    color: var(--muted);
+}
+
+.wms-preview-body img {
+    display: block;
+    max-width: 100%;
+    max-height: 100%;
+    object-fit: contain;
+    background: #fff;
+}
+
 .bottom-tabs {
    position: absolute;
    right: 0;
@@ -462,6 +613,13 @@ footer {
        right: 8px;
    }

+    .map-layer-panel {
+        top: 68px;
+        right: 8px;
+        width: min(320px, calc(100% - 16px));
+        max-height: calc(100% - 144px);
+    }
+
    .tool-sheet {
        top: 10%;
        bottom: var(--nav-height);
@@ -504,6 +662,10 @@ footer {
    .bottom-tabs button {
        font-size: 11px;
    }
+
+    .wms-preview {
+        padding: 8px;
+    }
 }

@media (max-width: 380px) {
@@ -2,6 +2,7 @@ const lmeState = {
    map: null,
    baseLayers: {},
    currentBase: null,
+    currentBaseName: "satellite",
    cadastre: null,
    cadastreLayers: ["CP.CadastralParcel", "codice_plla", "CP.CadastralZoning", "fabbricati"],
    cadastreOpacity: 0.75,
@@ -12,14 +13,17 @@ const lmeState = {
    gpsMarker: null,
    gpsAccuracy: null,
    gpsTrail: null,
-    currentParcelLayer: null,
+    selectedParcelsLayer: null,
+    gpsParcelLayer: null,
    gpsTrailEnabled: false,
    gpsTrailPoints: [],
    gpsWatchId: null,
    lastPosition: null,
    fileImportBound: false,
    resizeBound: false,
-    googleMapsLoading: null
+    googleMapsLoading: null,
+    azureMapsKey: null,
+    azureAttribution: null
 };

 window.lmeMap = {
@@ -27,6 +31,9 @@ window.lmeMap = {
    showSearchResult,
    displayOfficialParcel,
    exportCadastreView,
+    closeCadastrePreview,
+    clearSelectedParcels,
+    clearMapElements,
    fitImported,
    clearImported,
    addProjectMarker,
@@ -36,6 +43,8 @@ window.lmeMap = {
    loadWorkspace,
    setBaseLayer,
    configureGoogleMaps,
+    configureAzureMaps,
+    clearAzureMaps,
    setCadastreOpacity,
    toggleCadastreLayer,
    startGps,
@@ -99,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();
@@ -117,6 +127,19 @@ function init() {
            L.popup().setLatLng(event.latlng).setContent(info).openOn(lmeState.map);
        }
    });
+    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");
 }
@@ -163,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}`);
        }
@@ -195,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() {
@@ -384,6 +482,7 @@ function setBaseLayer(name) {
        lmeState.map.removeLayer(lmeState.currentBase);
    }
    lmeState.currentBase = selected.addTo(lmeState.map);
+    lmeState.currentBaseName = selected === lmeState.baseLayers[name] ? name : "satellite";
    lmeState.currentBase.bringToBack();
    const labels = {
        satellite: "Satellite Esri",
@@ -392,10 +491,17 @@ function setBaseLayer(name) {
        topographic: "Topografica Esri",
        terrain: "OpenTopoMap",
        carto: "CARTO Voyager",
+        "azure-road": "Strade Azure Maps",
+        "azure-satellite": "Satellite Azure Maps",
        "google-satellite": "Satellite Google Maps",
        "google-roadmap": "Strade Google Maps"
    };
    setInfo(`Sfondo attivo: ${labels[name] || labels.satellite}. Il catasto AdE resta sovrapposto.`);
+    if (lmeState.currentBaseName.startsWith("azure-")) {
+        void updateAzureAttribution();
+    } else {
+        clearAzureAttribution();
+    }
 }

 function configureGoogleMaps(apiKey) {
@@ -443,6 +549,123 @@ function createGoogleLayers() {
    lmeState.baseLayers["google-roadmap"] ||= L.gridLayer.googleMutant({ type: "roadmap", maxZoom: 22 });
 }

+function configureAzureMaps(subscriptionKey) {
+    const key = (subscriptionKey || "").trim();
+    if (!key) {
+        throw new Error("Chiave Azure Maps mancante.");
+    }
+    if (lmeState.azureMapsKey === key
+        && lmeState.baseLayers["azure-road"]
+        && lmeState.baseLayers["azure-satellite"]) {
+        return;
+    }
+
+    const activeAzureLayer = lmeState.currentBaseName.startsWith("azure-")
+        ? lmeState.currentBaseName
+        : null;
+    if (activeAzureLayer && lmeState.currentBase) {
+        lmeState.map.removeLayer(lmeState.currentBase);
+    }
+
+    lmeState.azureMapsKey = key;
+    lmeState.baseLayers["azure-road"] = createAzureLayer(key, "microsoft.base.road", 22);
+    lmeState.baseLayers["azure-satellite"] = createAzureLayer(key, "microsoft.imagery", 19);
+
+    if (activeAzureLayer) {
+        lmeState.currentBase = lmeState.baseLayers[activeAzureLayer].addTo(lmeState.map);
+        lmeState.currentBase.bringToBack();
+        void updateAzureAttribution();
+    }
+}
+
+function clearAzureMaps() {
+    if (lmeState.currentBaseName.startsWith("azure-") && lmeState.currentBase) {
+        lmeState.map.removeLayer(lmeState.currentBase);
+        lmeState.currentBase = lmeState.baseLayers.satellite.addTo(lmeState.map);
+        lmeState.currentBase.bringToBack();
+        lmeState.currentBaseName = "satellite";
+    }
+
+    delete lmeState.baseLayers["azure-road"];
+    delete lmeState.baseLayers["azure-satellite"];
+    lmeState.azureMapsKey = null;
+    clearAzureAttribution();
+}
+
+function createAzureLayer(key, tilesetId, maxNativeZoom) {
+    const url = `https://atlas.microsoft.com/map/tile?api-version=2024-04-01&tilesetId=${tilesetId}&zoom={z}&x={x}&y={y}&tileSize=256&language=it-IT&view=Auto&subscription-key=${encodeURIComponent(key)}`;
+    const layer = L.tileLayer(url, {
+        minZoom: tilesetId === "microsoft.imagery" ? 1 : 0,
+        maxNativeZoom,
+        maxZoom: 22,
+        attribution: "Microsoft Azure Maps"
+    });
+    let errorShown = false;
+    layer.on("tileerror", () => {
+        if (!errorShown) {
+            errorShown = true;
+            setInfo("Azure Maps non ha restituito le tessere. Controlla quota e permessi Render della chiave.");
+        }
+    });
+    return layer;
+}
+
+async function updateAzureAttribution() {
+    if (!lmeState.azureMapsKey || !lmeState.currentBaseName.startsWith("azure-")) {
+        return;
+    }
+
+    const requestedLayer = lmeState.currentBaseName;
+    const tilesetId = requestedLayer === "azure-satellite" ? "microsoft.imagery" : "microsoft.base.road";
+    const bounds = lmeState.map.getBounds();
+    const zoom = Math.min(lmeState.map.getZoom(), tilesetId === "microsoft.imagery" ? 19 : 22);
+    const bbox = [bounds.getWest(), bounds.getSouth(), bounds.getEast(), bounds.getNorth()].join(",");
+    const url = `https://atlas.microsoft.com/map/attribution?api-version=2024-04-01&tilesetId=${tilesetId}&zoom=${zoom}&bounds=${bbox}`;
+
+    try {
+        const response = await fetch(url, {
+            headers: {
+                Accept: "application/json",
+                "subscription-key": lmeState.azureMapsKey
+            }
+        });
+        if (!response.ok) {
+            return;
+        }
+        const payload = await response.json();
+        if (lmeState.currentBaseName !== requestedLayer) {
+            return;
+        }
+
+        const attribution = [...new Set((payload.copyrights || []).map(htmlToText).filter(Boolean))].join(" | ");
+        setAzureAttribution(attribution);
+    } catch {
+        clearAzureAttribution();
+    }
+}
+
+function setAzureAttribution(text) {
+    clearAzureAttribution();
+    if (!text) {
+        return;
+    }
+    lmeState.azureAttribution = escapeHtml(text);
+    lmeState.map.attributionControl.addAttribution(lmeState.azureAttribution);
+}
+
+function clearAzureAttribution() {
+    if (lmeState.azureAttribution) {
+        lmeState.map.attributionControl.removeAttribution(lmeState.azureAttribution);
+        lmeState.azureAttribution = null;
+    }
+}
+
+function htmlToText(value) {
+    const element = document.createElement("div");
+    element.innerHTML = String(value || "");
+    return element.textContent?.trim() || "";
+}
+
 function setCadastreOpacity(value) {
    lmeState.cadastreOpacity = Number(value || 0.75);
    if (lmeState.cadastre) {
@@ -459,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() {
@@ -466,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",
@@ -482,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.");
@@ -580,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
@@ -600,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");
 }
Author	SHA1	Message	Date
livio	0c42349937	Fix cadastral layer controls and WMS preview	2026-09-11 20:31:04 +02:00
livio	9733137fdd	Add Azure Maps road and satellite layers	2026-09-11 19:53:28 +02:00