Compare commits

..
15 Commits
16 changed files with 4798 additions and 164 deletions

No files matched your search

+114
View File
@@ -0,0 +1,114 @@
<details class="menu-help">
<summary>
<span aria-hidden="true">?</span>
<strong>Guida rapida</strong>
</summary>
<div class="menu-help-content">
<p>@Introduction</p>
<ol>
@foreach (var instruction in Instructions)
{
<li>@instruction</li>
}
</ol>
</div>
</details>
@code {
[Parameter, EditorRequired]
public string Topic { get; set; } = string.Empty;
private string Introduction => Topic switch
{
"layers" => "Qui controlli visibilita, ordine, selezione e organizzazione di tutti gli oggetti presenti sulla mappa.",
"cadastre" => "Trova una particella nel catalogo catastale e mostrane il confine ufficiale sulla mappa.",
"data" => "Importa file GIS, crea disegni e misure oppure aggiungi punti di interesse.",
"save" => "Esporta gli elementi della mappa in un file compatibile con altre applicazioni GIS e GPS.",
"projects" => "Salva il lavoro completo, riaprilo, organizzalo e recupera revisioni o copie di sicurezza.",
"tools" => "Consulta e gestisci gli oggetti in modo avanzato, controlla le coordinate e prepara mappe offline.",
"settings" => "Personalizza mappa, salvataggi, GPS, sincronizzazione e servizi esterni.",
_ => "Consulta le indicazioni essenziali per usare questo pannello."
};
private IReadOnlyList<string> Instructions => Topic switch
{
"layers" =>
[
"Visibilita: usa la casella di una categoria o di un gruppo per mostrare o nascondere tutti i suoi contenuti; la casella del singolo oggetto agisce solo su quello.",
"Gerarchia: premi la freccia accanto alla maniglia per aprire un gruppo. Il rientro, il carattere e la tonalita indicano se una riga e figlia, nipote o di livello successivo.",
"Selezione multipla: attiva il flag sulle righe desiderate. Esempio: seleziona tre poligoni per esportare solo quelli oppure per bloccarli con una sola operazione.",
"Rinomina e attributi: Rinomina modifica il nome mostrato e salvato nei progetti e nei file esportati; Attributi apre un editor multilinea per consultare o correggere i dati associati.",
"Colori: espandi un padre o un figlio e usa gli editor di linea e riempimento. Puoi scegliere il colore, prelevarlo con il contagocce se supportato, oppure inserire e copiare i valori HEX, RGB e HSL; sul padre viene applicato a tutto il gruppo.",
"Blocco: il lucchetto impedisce modifiche e spostamenti involontari. Sblocca l'oggetto prima di usare la matita o gli strumenti geometrici.",
"Sposta nel gruppo cambia l'appartenenza. Esempio: trasferisci un poligono da Disegni e POI a Progetti e dati importati, oppure in un nuovo sottogruppo chiamato Rilievo nord.",
"Sposta geometria cambia invece le coordinate dell'oggetto, per esempio 100 metri verso nord; non modifica il gruppo di appartenenza.",
"Rimuovi dal progetto nasconde l'elemento e lo esclude dai salvataggi successivi; Elimina lo sposta nel cestino. Usa gli strumenti avanzati per ripristinare l'ultima rimozione o svuotare definitivamente il cestino.",
"Ordine: trascina la maniglia di una riga verso l'alto o il basso per cambiare la sovrapposizione sulla mappa."
],
"cadastre" =>
[
"Compila i campi nell'ordine Regione, Comune, Foglio e Particella: ogni scelta carica l'elenco necessario al campo successivo.",
"Esempio: scegli Campania, il Comune, il foglio 12 e la particella 345, poi premi Mostra particella sulla mappa.",
"Il confine ufficiale viene evidenziato sulla mappa. Se Centra e zooma quando seleziono un oggetto e attivo nelle Impostazioni, la mappa lo inquadra automaticamente.",
"Se la particella e gia presente tra disegni, progetti o file GeoJSON, KML e KMZ, l'app riconosce il riferimento catastale o la geometria e riutilizza l'oggetto esistente senza duplicarlo.",
"Se un oggetto gia presente era nascosto, viene reso nuovamente visibile. La visibilita generale dei contorni evidenziati e dei dati importati resta controllabile dal pannello Layer.",
"Quando il servizio ufficiale non restituisce subito il confine, attendi il completamento indicato nel pannello e riprova mantenendo gli stessi dati selezionati."
],
"data" =>
[
"Importazione: premi Carica KML, KMZ o GeoJSON e scegli il file dal dispositivo. I nomi e gli attributi riconosciuti vengono mantenuti.",
"Per KML e KMZ, Includi anche il layer del foglio importa pure cornici e riquadri generali; disattivalo quando vuoi conservare soltanto le particelle riconosciute.",
"Usa Mostra dati importati e Mostra cornice per controllare separatamente la visibilita. Inquadra dati porta la mappa sull'estensione completa del file.",
"Disegno: premi Mostra strumenti sulla mappa, torna alla mappa e scegli linea, poligono, rettangolo, cerchio o POI nella barra Leaflet.",
"Modifica ed eliminazione possono agire sull'oggetto selezionato o su tutti i disegni. Prima seleziona sulla mappa la linea o il poligono interessato, poi scegli l'ambito dal piccolo comando accanto alla matita o al cestino.",
"Annulla e Ripristina coprono disegni, spostamenti, rinomine ed eliminazioni recenti. Recupera ultimo autosalvataggio ricarica invece l'ultima copia locale creata automaticamente.",
"Esempio POI: porta il centro della mappa sull'ingresso di un terreno, scrivi Cancello nord e premi Aggiungi POI al centro mappa.",
"Per rinominare, bloccare o trasferire un oggetto in un altro gruppo, apri Layer e usa i comandi della relativa riga."
],
"save" =>
[
"Inserisci un nome riconoscibile, per esempio Rilievo particelle 12-345, poi scegli il formato in base all'uso previsto.",
"GeoJSON e adatto ai software GIS e conserva geometrie, nomi e attributi; KML e KMZ sono adatti a Google Earth, con KMZ piu compatto per invio e archiviazione.",
"GPX e pensato per dispositivi e applicazioni GPS; PDF crea un rapporto consultabile e stampabile invece di un file vettoriale modificabile.",
"Attiva solo le categorie da includere. Esempio: per consegnare disegni e particelle importate senza la traccia GPS, lascia attive quelle due voci e disattiva Traccia GPS.",
"Solo oggetti selezionati esporta esclusivamente le righe contrassegnate nel pannello Layer. Se non devi filtrare manualmente, lascia questa opzione disattivata.",
"Premi Esporta e salva file e scegli la cartella o l'app di destinazione proposta dal dispositivo.",
"Nomi rinominati e attributi vengono salvati in GeoJSON, KML e KMZ. Gli sfondi satellitari, stradali e WMS non vengono incorporati nei file vettoriali."
],
"projects" =>
[
"Nuovo progetto: inserisci un nome, scegli se includere i contorni catastali evidenziati e premi Salva progetto. Vengono conservati oggetti, gruppi, nomi, attributi e opzioni di visualizzazione.",
"Aggiornamento: dopo aver aperto un progetto, usa di nuovo Salva progetto con lo stesso nome per aggiornarlo. Se nelle Impostazioni attivi Aggiorna automaticamente il progetto aperto, le modifiche vengono registrate dopo 3 secondi di inattivita.",
"Cartelle: seleziona un progetto, scrivi per esempio Cantieri 2026 e premi Sposta per organizzarlo nell'archivio; questa operazione non sposta le geometrie sulla mappa.",
"Duplica crea una copia modificabile, utile prima di una variante importante o quando ricevi un progetto in sola lettura.",
"Archivia nasconde logicamente i lavori conclusi senza eliminarli; Ripristina li riporta tra quelli attivi. Elimina rimuove invece il progetto dall'archivio.",
"Condividi modificabile consente al destinatario di continuare il lavoro; Condividi in sola lettura protegge l'originale e richiede una duplicazione per modificarlo.",
"Revisioni: seleziona una data e usa Apri revisione per consultarne lo stato oppure Confronta per vedere le differenze con la versione corrente.",
"Backup: Crea backup raccoglie tutti i progetti in un file trasferibile. Ripristina backup ricarica un archivio completo; Importa progetto aggiunge invece un singolo progetto condiviso."
],
"tools" =>
[
"Tabella oggetti: apre una vista ordinata di particelle, file importati e disegni. Usa i flag per selezionare piu righe e il lucchetto per proteggerle dalle modifiche.",
"Coordinate WGS84 e UTM: scegli un punto sulla mappa per leggere latitudine e longitudine oppure le coordinate metriche UTM, utili per rilievi e confronti tecnici.",
"Registro operazioni: mostra in ordine cronologico disegni, modifiche, rinomine, spostamenti ed eliminazioni, cosi puoi capire cosa e cambiato durante la sessione.",
"Cestino: Ripristina ultima rimozione recupera l'elemento eliminato piu recente. Svuota cestino elimina definitivamente tutti gli elementi rimossi e non consente ulteriori recuperi.",
"Mappe offline: prima inquadra sulla mappa la zona che ti servira sul campo, quindi scegli quanti livelli di zoom aggiuntivi scaricare. Valori maggiori offrono piu dettaglio ma richiedono piu spazio e tempo.",
"Esempio offline: inquadra il cantiere e le strade di accesso, imposta 2 livelli aggiuntivi e premi Scarica area visibile mentre hai connessione.",
"Usa mappe offline seleziona lo sfondo salvato localmente; Svuota archivio libera lo spazio occupato dalle tessere scaricate."
],
"settings" =>
[
"Mappa e sfondo: scegli la cartografia di base e regola Trasparenza catasto per leggere meglio confini e immagini sottostanti. Esempio: riducila quando le linee coprono dettagli del terreno.",
"Autosalvataggio locale dopo ogni modifica: se attivo, ogni disegno, modifica, rinomina o eliminazione aggiorna immediatamente una copia di recupero nel dispositivo. Per usarla apri Dati e disegni e premi Recupera ultimo autosalvataggio.",
"Aggiorna automaticamente il progetto aperto: funziona solo dopo aver aperto o salvato un progetto modificabile. Dopo una modifica attende 3 secondi senza altre operazioni e aggiorna quel progetto; un progetto in sola lettura non viene mai sovrascritto.",
"Backup automatico: scegli Giornaliero o Settimanale. Alla successiva pressione di Salva progetto, se e trascorso l'intervallo, viene creata una copia interna di tutti i progetti; l'app conserva le 10 copie automatiche piu recenti. Disattivato non crea nuove copie programmate.",
"Esempio consigliato: lascia attivo l'autosalvataggio locale, attiva l'aggiornamento del progetto aperto durante i rilievi e imposta un backup giornaliero. Prima di modifiche importanti crea anche un backup manuale dal menu Progetti.",
"Aggancio ai vertici: avvicinando un nuovo vertice a uno esistente, l'app lo allinea entro la distanza in pixel scelta. Aumenta la distanza su schermi piccoli; riducila quando ci sono molti vertici ravvicinati.",
"Centra e zooma quando seleziono un oggetto: attivalo per inquadrare automaticamente ogni elemento scelto; disattivalo se vuoi mantenere ferma la vista mentre lavori dall'elenco Layer.",
"WebDAV: inserisci indirizzo, utente e password applicazione, salva la configurazione, poi usa Invia al cloud per caricare il backup o Scarica dal cloud per ripristinare quello remoto.",
"GPS e percorso: Mostra punto visualizza posizione e precisione; Registra traccia memorizza il cammino; distanza e avvisi aiutano a controllare l'avvicinamento e l'attraversamento del confine selezionato.",
"Google Maps e Azure Maps richiedono le rispettive chiavi solo quando scegli quegli sfondi. Controlla nuova versione confronta la versione installata con l'ultima pubblicata e mostra le relative modifiche."
],
_ => []
};
}
+589 -24
View File
@@ -8,6 +8,8 @@
@inject AzureMapsService AzureMapsService @inject AzureMapsService AzureMapsService
@inject ProjectStorageService ProjectStorageService @inject ProjectStorageService ProjectStorageService
@inject MapExportService MapExportService @inject MapExportService MapExportService
@inject CloudSyncService CloudSyncService
@inject AppUpdateService AppUpdateService
@implements IAsyncDisposable @implements IAsyncDisposable
<PageTitle>LME Mappe Catastali</PageTitle> <PageTitle>LME Mappe Catastali</PageTitle>
@@ -19,9 +21,11 @@
<header class="map-toolbar"> <header class="map-toolbar">
<div class="app-identity"> <div class="app-identity">
<strong>LME Catasto</strong> <strong>LME Catasto</strong>
<span>@Status</span> <span class="app-status-line">@Status @if (HasUnsavedChanges) { <i title="Modifiche non salvate"></i> }</span>
</div> </div>
<div class="toolbar-actions"> <div class="toolbar-actions">
<button class="map-icon-command" title="Annulla ultima operazione" aria-label="Annulla" @onclick="UndoMapChange">↶</button>
<button class="map-icon-command" title="Ripristina operazione" aria-label="Ripristina" @onclick="RedoMapChange">↷</button>
<button class="toolbar-button layer-button @(LayerPanelOpen ? "is-active" : null)" <button class="toolbar-button layer-button @(LayerPanelOpen ? "is-active" : null)"
title="Layer catastali" title="Layer catastali"
aria-expanded="@LayerPanelOpen" aria-expanded="@LayerPanelOpen"
@@ -29,10 +33,25 @@
<span class="layer-symbol" aria-hidden="true"></span> <span class="layer-symbol" aria-hidden="true"></span>
<span>Layer</span> <span>Layer</span>
</button> </button>
<button class="toolbar-button" @onclick='() => SelectTab(ActiveTab == "search" ? "map" : "search")'>Cerca</button> <button class="map-menu-button @(NavigationMenuOpen ? "is-active" : null)" title="Apri menu" aria-label="Apri menu" aria-expanded="@NavigationMenuOpen" @onclick="ToggleNavigationMenu">☰</button>
</div> </div>
</header> </header>
@if (NavigationMenuOpen)
{
<nav class="map-navigation-menu" aria-label="Menu principale">
<button @onclick='() => SelectTab("map")'>Mappa</button>
<button @onclick='() => SelectTab("search")'>Cerca località</button>
<button @onclick='() => SelectTab("cadastre")'>Ricerca catastale</button>
<button @onclick='() => SelectTab("data")'>Dati e disegni</button>
<button @onclick='() => SelectTab("projects")'>Progetti</button>
<button @onclick='() => SelectTab("save")'>Esporta</button>
<button @onclick='() => SelectTab("tools")'>Strumenti avanzati</button>
<button @onclick='() => SelectTab("settings")'>Impostazioni</button>
<div class="menu-credits"><strong>LME Mappe Catastali</strong><span>Autore: Livio Merola</span><a href="mailto:info@liviomerola.net">info@liviomerola.net</a><span>Mappe: Esri, OpenStreetMap, CARTO, OpenTopoMap. Catasto: Agenzia delle Entrate CC BY 4.0.</span></div>
</nav>
}
<div class="map-search @(ActiveTab == "search" ? "is-open" : null)"> <div class="map-search @(ActiveTab == "search" ? "is-open" : null)">
<input @bind="SearchText" @bind:event="oninput" placeholder="Localita, indirizzo o coordinate" /> <input @bind="SearchText" @bind:event="oninput" placeholder="Localita, indirizzo o coordinate" />
<button @onclick="SearchLocation">Vai</button> <button @onclick="SearchLocation">Vai</button>
@@ -62,7 +81,7 @@
<input type="checkbox" @bind="ShowSelectedParcels" @bind:after="ApplySelectedParcelsVisibility" /> <input type="checkbox" @bind="ShowSelectedParcels" @bind:after="ApplySelectedParcelsVisibility" />
<span> <span>
<strong>Particelle catastali evidenziate</strong> <strong>Particelle catastali evidenziate</strong>
<small>Contorni rossi ottenuti da ricerca o GPS</small> <small>Contorni ottenuti da ricerca o GPS</small>
</span> </span>
</label> </label>
<label class="map-layer-option"> <label class="map-layer-option">
@@ -83,6 +102,7 @@
<button class="danger-command" @onclick="ClearSelectedParcels">Elimina definitivamente le particelle selezionate</button> <button class="danger-command" @onclick="ClearSelectedParcels">Elimina definitivamente le particelle selezionate</button>
<button class="danger-command" @onclick="ClearMapElements">Pulisci elementi mappa</button> <button class="danger-command" @onclick="ClearMapElements">Pulisci elementi mappa</button>
</div> </div>
<MenuHelp Topic="layers" />
</section> </section>
} }
@@ -170,6 +190,7 @@
<strong>Mappa pubblica ufficiale</strong> <strong>Mappa pubblica ufficiale</strong>
<p>I confini visualizzati arrivano dai servizi WMS/WFS open data dell'Agenzia delle Entrate e non richiedono CAPTCHA.</p> <p>I confini visualizzati arrivano dai servizi WMS/WFS open data dell'Agenzia delle Entrate e non richiedono CAPTCHA.</p>
</div> </div>
<MenuHelp Topic="cadastre" />
</section> </section>
} }
else if (ActiveTab == "data") else if (ActiveTab == "data")
@@ -211,6 +232,10 @@
<section class="panel-section"> <section class="panel-section">
<h2>Disegni e misure</h2> <h2>Disegni e misure</h2>
<div class="button-row">
<button class="secondary-command" @onclick="UndoMapChange">Annulla</button>
<button class="secondary-command" @onclick="RedoMapChange">Ripristina</button>
</div>
<label class="toggle-line project-save-option"> <label class="toggle-line project-save-option">
<input type="checkbox" @bind="ShowDrawingMeasurements" @bind:after="ApplyDrawingMeasurementsVisibility" /> <input type="checkbox" @bind="ShowDrawingMeasurements" @bind:after="ApplyDrawingMeasurementsVisibility" />
<span>Mostra superficie, perimetro e lati</span> <span>Mostra superficie, perimetro e lati</span>
@@ -219,6 +244,7 @@
@(DrawToolsVisible ? "Nascondi strumenti sulla mappa" : "Mostra strumenti sulla mappa") @(DrawToolsVisible ? "Nascondi strumenti sulla mappa" : "Mostra strumenti sulla mappa")
</button> </button>
<button class="danger-command" @onclick="ClearDrawings">Elimina disegni e POI</button> <button class="danger-command" @onclick="ClearDrawings">Elimina disegni e POI</button>
<button class="secondary-command" @onclick="RestoreAutosave">Recupera ultimo autosalvataggio</button>
</section> </section>
<section class="panel-section"> <section class="panel-section">
@@ -229,6 +255,7 @@
</label> </label>
<button class="primary-command" @onclick="AddProjectMarker">Aggiungi POI al centro mappa</button> <button class="primary-command" @onclick="AddProjectMarker">Aggiungi POI al centro mappa</button>
</section> </section>
<MenuHelp Topic="data" />
</section> </section>
} }
else if (ActiveTab == "save") else if (ActiveTab == "save")
@@ -246,9 +273,15 @@
<option value="geojson">GeoJSON</option> <option value="geojson">GeoJSON</option>
<option value="kml">KML</option> <option value="kml">KML</option>
<option value="kmz">KMZ compresso</option> <option value="kmz">KMZ compresso</option>
<option value="gpx">GPX per GPS</option>
<option value="pdf">Rapporto PDF</option>
</select> </select>
</label> </label>
<div class="export-options" role="group" aria-label="Oggetti da esportare"> <div class="export-options" role="group" aria-label="Oggetti da esportare">
<label class="toggle-line project-save-option">
<input type="checkbox" @bind="ExportSelectedOnly" @bind:after="SaveFlagPreferences" />
<span>Solo oggetti selezionati nel pannello Layer</span>
</label>
<label class="toggle-line project-save-option"> <label class="toggle-line project-save-option">
<input type="checkbox" @bind="ExportImported" @bind:after="SaveFlagPreferences" /> <input type="checkbox" @bind="ExportImported" @bind:after="SaveFlagPreferences" />
<span>Particelle e dati GIS importati</span> <span>Particelle e dati GIS importati</span>
@@ -259,7 +292,7 @@
</label> </label>
<label class="toggle-line project-save-option"> <label class="toggle-line project-save-option">
<input type="checkbox" @bind="ExportCadastral" @bind:after="SaveFlagPreferences" /> <input type="checkbox" @bind="ExportCadastral" @bind:after="SaveFlagPreferences" />
<span>Particelle catastali rosse e GPS</span> <span>Particelle catastali evidenziate e GPS</span>
</label> </label>
<label class="toggle-line project-save-option"> <label class="toggle-line project-save-option">
<input type="checkbox" @bind="ExportDrawings" @bind:after="SaveFlagPreferences" /> <input type="checkbox" @bind="ExportDrawings" @bind:after="SaveFlagPreferences" />
@@ -280,6 +313,7 @@
<small class="field-help">KML e KMZ sono compatibili con Google Earth. Gli sfondi satellitari e il WMS non vengono incorporati nel file vettoriale.</small> <small class="field-help">KML e KMZ sono compatibili con Google Earth. Gli sfondi satellitari e il WMS non vengono incorporati nel file vettoriale.</small>
</section> </section>
<MenuHelp Topic="save" />
</section> </section>
} }
else if (ActiveTab == "projects") else if (ActiveTab == "projects")
@@ -293,7 +327,7 @@
</label> </label>
<label class="toggle-line project-save-option"> <label class="toggle-line project-save-option">
<input type="checkbox" @bind="IncludeCadastralParcels" @bind:after="SaveFlagPreferences" /> <input type="checkbox" @bind="IncludeCadastralParcels" @bind:after="SaveFlagPreferences" />
<span>Includi le particelle catastali rosse</span> <span>Includi le particelle catastali evidenziate</span>
</label> </label>
<button class="primary-command" @onclick="SaveProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(NewProjectName))">Salva progetto</button> <button class="primary-command" @onclick="SaveProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(NewProjectName))">Salva progetto</button>
</section> </section>
@@ -306,17 +340,55 @@
<option value="">Seleziona un progetto</option> <option value="">Seleziona un progetto</option>
@foreach (var project in Projects) @foreach (var project in Projects)
{ {
<option value="@project.Id">@project.Name - @project.UpdatedAt.ToLocalTime().ToString("dd/MM/yyyy HH:mm")</option> <option value="@project.Id">@(project.IsArchived ? "[ARCHIVIATO] " : "")@(project.IsReadOnly ? "[SOLA LETTURA] " : "")@(string.IsNullOrWhiteSpace(project.Folder) ? "" : $"{project.Folder} / ")@project.Name - @project.UpdatedAt.ToLocalTime().ToString("dd/MM/yyyy HH:mm")</option>
}
</select>
</label>
<div class="project-command-stack">
<button @onclick="LoadProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Apri</button>
<button class="danger-command" @onclick="DeleteProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Elimina</button>
</div>
<label>
Cartella
<input @bind="ProjectFolder" placeholder="Es. Cantieri 2026" maxlength="60" />
</label>
<div class="project-command-stack">
<button class="secondary-command" @onclick="UpdateProjectFolder" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Sposta</button>
<button class="secondary-command" @onclick="DuplicateProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Duplica</button>
<button class="secondary-command" @onclick="ToggleProjectArchive" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">@(SelectedProject?.IsArchived == true ? "Ripristina" : "Archivia")</button>
<button class="secondary-command" @onclick='() => ShareProject(false)' disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Condividi modificabile</button>
<button class="secondary-command" @onclick='() => ShareProject(true)' disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Condividi in sola lettura</button>
</div>
@if (SelectedProject?.IsReadOnly == true)
{
<small class="field-help">Questo progetto è protetto. Usa Duplica per crearne una copia modificabile.</small>
}
<label>
Revisione precedente
<select @bind="SelectedVersionId" disabled="@(ProjectVersions.Count == 0)">
<option value="">Seleziona revisione</option>
@foreach (var version in ProjectVersions)
{
<option value="@version.Id">@version.UpdatedAt.ToLocalTime().ToString("dd/MM/yyyy HH:mm:ss")</option>
} }
</select> </select>
</label> </label>
<div class="button-row"> <div class="button-row">
<button @onclick="LoadProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Apri</button> <button class="secondary-command" @onclick="LoadProjectVersion" disabled="@(string.IsNullOrWhiteSpace(SelectedVersionId))">Apri revisione</button>
<button class="danger-command" @onclick="DeleteProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Elimina</button> <button class="secondary-command" @onclick="CompareProjectVersion" disabled="@(string.IsNullOrWhiteSpace(SelectedVersionId))">Confronta</button>
</div> </div>
<div class="project-archive-state">@ProjectArchiveMessage</div> <div class="project-archive-state">@ProjectArchiveMessage</div>
</section> </section>
<section class="panel-section">
<h2>Backup e trasferimento</h2>
<div class="button-row">
<button class="secondary-command" @onclick="ShareFullBackup">Crea backup</button>
<button class="secondary-command" @onclick="RestoreBackup">Ripristina backup</button>
</div>
<button class="secondary-command" @onclick="ImportProject">Importa progetto condiviso</button>
</section>
<section class="panel-section"> <section class="panel-section">
<h2>Visualizzazione progetto</h2> <h2>Visualizzazione progetto</h2>
<label class="toggle-line project-save-option"> <label class="toggle-line project-save-option">
@@ -337,6 +409,39 @@
<span>Mostra misure dei disegni</span> <span>Mostra misure dei disegni</span>
</label> </label>
</section> </section>
<MenuHelp Topic="projects" />
</section>
}
else if (ActiveTab == "tools")
{
<section class="panel-content">
<section class="panel-section">
<h2>Oggetti e coordinate</h2>
<button class="primary-command" @onclick="ShowObjectTable">Apri tabella oggetti e particelle</button>
<button class="secondary-command" @onclick="ShowCoordinateInspector">Coordinate WGS84 e UTM</button>
<button class="secondary-command" @onclick="ShowAuditLog">Registro operazioni</button>
</section>
<section class="panel-section">
<h2>Cestino</h2>
<div class="button-row">
<button class="secondary-command" @onclick="RestoreTrashItem">Ripristina ultima rimozione</button>
<button class="danger-command" @onclick="EmptyTrash">Svuota cestino</button>
</div>
</section>
<section class="panel-section">
<h2>Mappe offline</h2>
<label>
Livelli di zoom aggiuntivi
<input type="number" min="0" max="4" @bind="OfflineExtraZoomLevels" />
</label>
<button class="primary-command" @onclick="DownloadOfflineArea" disabled="@OfflineBusy">@(OfflineBusy ? "Download in corso..." : "Scarica area visibile")</button>
<div class="button-row">
<button class="secondary-command" @onclick="UseOfflineMap">Usa mappe offline</button>
<button class="danger-command" @onclick="ClearOfflineArea">Svuota archivio</button>
</div>
<small class="field-help">@OfflineStatus</small>
</section>
<MenuHelp Topic="tools" />
</section> </section>
} }
else if (ActiveTab == "settings") else if (ActiveTab == "settings")
@@ -353,6 +458,7 @@
<option value="topographic">Topografica - Esri World Topographic</option> <option value="topographic">Topografica - Esri World Topographic</option>
<option value="terrain">Terreno - OpenTopoMap</option> <option value="terrain">Terreno - OpenTopoMap</option>
<option value="carto">Strade chiare - CARTO Voyager</option> <option value="carto">Strade chiare - CARTO Voyager</option>
<option value="offline">Mappe salvate offline</option>
<option value="azure-road">Strade - Azure Maps</option> <option value="azure-road">Strade - Azure Maps</option>
<option value="azure-satellite">Satellite - Azure Maps</option> <option value="azure-satellite">Satellite - Azure Maps</option>
<option value="google-satellite">Satellite - Google Maps</option> <option value="google-satellite">Satellite - Google Maps</option>
@@ -383,6 +489,74 @@
</div> </div>
</section> </section>
<section class="panel-section">
<h2>Modifica e sicurezza dati</h2>
<label class="toggle-line project-save-option">
<input type="checkbox" @bind="AutoSaveEnabled" @bind:after="ApplyAdvancedOptions" />
<span>Autosalvataggio locale dopo ogni modifica</span>
</label>
<label class="toggle-line project-save-option">
<input type="checkbox" @bind="AutoSaveOpenProject" @bind:after="SaveFlagPreferences" />
<span>Aggiorna automaticamente il progetto aperto</span>
</label>
<label>
Backup automatico
<select @bind="AutomaticBackupFrequency" @bind:after="SaveFlagPreferences">
<option value="off">Disattivato</option>
<option value="daily">Giornaliero</option>
<option value="weekly">Settimanale</option>
</select>
</label>
<label class="toggle-line project-save-option">
<input type="checkbox" @bind="SnapEnabled" @bind:after="ApplyAdvancedOptions" />
<span>Aggancia i vertici agli oggetti vicini</span>
</label>
<label class="toggle-line project-save-option">
<input type="checkbox" @bind="AutoFitSelectedObject" @bind:after="ApplyAdvancedOptions" />
<span>Centra e zooma quando seleziono un oggetto</span>
</label>
<label>
Distanza aggancio in pixel
<input type="range" min="4" max="40" step="1" @bind="SnapDistancePixels" @bind:after="ApplyAdvancedOptions" />
</label>
</section>
<section class="panel-section">
<h2>Sincronizzazione WebDAV</h2>
<label>
Indirizzo cartella o file WebDAV
<input type="url" @bind="WebDavEndpoint" placeholder="https://server/remote.php/dav/files/utente/cartella" />
</label>
<label>
Nome utente
<input @bind="WebDavUserName" autocomplete="username" />
</label>
<label>
Password o password applicazione
<input type="password" @bind="WebDavPassword" autocomplete="current-password" />
</label>
<button class="secondary-command" @onclick="SaveWebDavSettings">Salva configurazione</button>
<div class="button-row">
<button class="primary-command" @onclick="SyncUpload" disabled="@SyncBusy">Invia al cloud</button>
<button class="secondary-command" @onclick="SyncDownload" disabled="@SyncBusy">Scarica dal cloud</button>
</div>
<small class="field-help">@SyncStatus</small>
</section>
<section class="panel-section">
<h2>Aggiornamenti applicazione</h2>
<button class="primary-command" @onclick="CheckForUpdates" disabled="@UpdateBusy">@(UpdateBusy ? "Controllo..." : "Controlla nuova versione")</button>
@if (!string.IsNullOrWhiteSpace(UpdateDownloadUrl))
{
<button class="secondary-command" @onclick="OpenUpdateDownload">Scarica aggiornamento</button>
}
<small class="field-help">@UpdateStatus</small>
@if (!string.IsNullOrWhiteSpace(UpdateReleaseNotes))
{
<pre class="release-notes">@UpdateReleaseNotes</pre>
}
</section>
<section class="panel-section"> <section class="panel-section">
<h2>GPS e percorso</h2> <h2>GPS e percorso</h2>
<label class="toggle-line project-save-option"> <label class="toggle-line project-save-option">
@@ -393,6 +567,19 @@
<input type="checkbox" @bind="TrailEnabled" @bind:after="ApplyTrailOption" /> <input type="checkbox" @bind="TrailEnabled" @bind:after="ApplyTrailOption" />
<span>Registra la traccia mentre cammini</span> <span>Registra la traccia mentre cammini</span>
</label> </label>
<div class="button-row">
<button class="secondary-command" @onclick="ShowTrailStats">Riepilogo traccia</button>
<button class="danger-command" @onclick="ClearGpsTrail">Elimina traccia</button>
</div>
<label class="toggle-line project-save-option">
<input type="checkbox" @bind="GpsProximityEnabled" @bind:after="ApplyAdvancedOptions" />
<span>Distanza e direzione dal bordo selezionato</span>
</label>
<label class="toggle-line project-save-option">
<input type="checkbox" @bind="GpsBoundaryAlertEnabled" @bind:after="ApplyAdvancedOptions" />
<span>Avvisa quando entro o esco dall'area selezionata</span>
</label>
<button class="secondary-command" @onclick="SaveGpsMeasurementPoint">Salva punto GPS con precisione e ora</button>
</section> </section>
<section class="panel-section"> <section class="panel-section">
@@ -406,6 +593,7 @@
<button class="secondary-command" @onclick="ExportCadastralImage">Mostra 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> <footer>Dati catastali: Agenzia delle Entrate, licenza CC BY 4.0. App indipendente.</footer>
</section> </section>
<MenuHelp Topic="settings" />
</section> </section>
} }
</aside> </aside>
@@ -432,14 +620,6 @@
</section> </section>
</div> </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>
<button class="@(ActiveTab == "data" ? "active" : null)" @onclick='() => SelectTab("data")'>Dati</button>
<button class="@(ActiveTab == "projects" ? "active" : null)" @onclick='() => SelectTab("projects")'>Progetti</button>
<button class="@(ActiveTab == "save" ? "active" : null)" @onclick='() => SelectTab("save")'>Salvataggio</button>
<button class="@(ActiveTab == "settings" ? "active" : null)" @onclick='() => SelectTab("settings")'>Impostazioni</button>
</nav>
</section> </section>
</div> </div>
@@ -453,6 +633,8 @@
private string PoiName { get; set; } = string.Empty; private string PoiName { get; set; } = string.Empty;
private string SelectedProjectId { get; set; } = string.Empty; private string SelectedProjectId { get; set; } = string.Empty;
private string ProjectArchiveMessage { get; set; } = "Nessun progetto salvato."; private string ProjectArchiveMessage { get; set; } = "Nessun progetto salvato.";
private string ProjectFolder { get; set; } = string.Empty;
private string SelectedVersionId { get; set; } = string.Empty;
private string Status { get; set; } = "online"; private string Status { get; set; } = "online";
private string SelectedBaseLayer { get; set; } = "satellite"; private string SelectedBaseLayer { get; set; } = "satellite";
private string GoogleMapsApiKey { get; set; } = string.Empty; private string GoogleMapsApiKey { get; set; } = string.Empty;
@@ -472,6 +654,9 @@
private bool DrawToolsVisible { get; set; } private bool DrawToolsVisible { get; set; }
private bool TrailEnabled { get; set; } private bool TrailEnabled { get; set; }
private bool LayerPanelOpen { get; set; } private bool LayerPanelOpen { get; set; }
private bool NavigationMenuOpen { get; set; }
private bool HasUnsavedChanges { get; set; }
private DotNetObjectReference<Home>? MapCallbackReference { get; set; }
private bool IncludeCadastralParcels { get; set; } = true; private bool IncludeCadastralParcels { get; set; } = true;
private bool IncludeKmlSheetLayer { get; set; } private bool IncludeKmlSheetLayer { get; set; }
private bool ShowImportedSheetLayer { get; set; } private bool ShowImportedSheetLayer { get; set; }
@@ -485,8 +670,30 @@
private bool ExportDrawings { get; set; } = true; private bool ExportDrawings { get; set; } = true;
private bool ExportPoi { get; set; } = true; private bool ExportPoi { get; set; } = true;
private bool ExportTrail { get; set; } = true; private bool ExportTrail { get; set; } = true;
private bool ExportSelectedOnly { get; set; }
private bool AutoSaveEnabled { get; set; } = true;
private bool AutoSaveOpenProject { get; set; }
private string AutomaticBackupFrequency { get; set; } = "daily";
private bool SnapEnabled { get; set; } = true;
private bool AutoFitSelectedObject { get; set; }
private int SnapDistancePixels { get; set; } = 14;
private bool GpsProximityEnabled { get; set; } = true;
private bool GpsBoundaryAlertEnabled { get; set; }
private int OfflineExtraZoomLevels { get; set; } = 2;
private bool OfflineBusy { get; set; }
private string OfflineStatus { get; set; } = "Nessuna area verificata.";
private string WebDavEndpoint { get; set; } = string.Empty;
private string WebDavUserName { get; set; } = string.Empty;
private string WebDavPassword { get; set; } = string.Empty;
private bool SyncBusy { get; set; }
private string SyncStatus { get; set; } = "Sincronizzazione non configurata.";
private bool UpdateBusy { get; set; }
private string UpdateStatus { get; set; } = $"Versione installata: {AppUpdateService.CurrentVersion}";
private string UpdateDownloadUrl { get; set; } = string.Empty;
private string UpdateReleaseNotes { get; set; } = string.Empty;
private CancellationTokenSource? CatalogCancellation { get; set; } private CancellationTokenSource? CatalogCancellation { get; set; }
private CancellationTokenSource? GpsLookupCancellation { get; set; } private CancellationTokenSource? GpsLookupCancellation { get; set; }
private CancellationTokenSource? ProjectAutoSaveCancellation { get; set; }
private long LastGpsLookupAt; private long LastGpsLookupAt;
private int GpsLookupInProgress; private int GpsLookupInProgress;
@@ -495,6 +702,8 @@
private IReadOnlyList<string> Sheets { get; set; } = []; private IReadOnlyList<string> Sheets { get; set; } = [];
private IReadOnlyList<ParcelOption> Parcels { get; set; } = []; private IReadOnlyList<ParcelOption> Parcels { get; set; } = [];
private IReadOnlyList<MapProjectSummary> Projects { get; set; } = []; private IReadOnlyList<MapProjectSummary> Projects { get; set; } = [];
private IReadOnlyList<MapProjectVersion> ProjectVersions { get; set; } = [];
private MapProjectSummary? SelectedProject => Projects.FirstOrDefault(item => item.Id == SelectedProjectId);
private MunicipalityOption? SelectedMunicipality => private MunicipalityOption? SelectedMunicipality =>
Municipalities.FirstOrDefault(item => item.Code == SelectedMunicipalityCode); Municipalities.FirstOrDefault(item => item.Code == SelectedMunicipalityCode);
@@ -508,6 +717,7 @@
"data" => "Dati e disegni", "data" => "Dati e disegni",
"projects" => "Archivio progetti", "projects" => "Archivio progetti",
"save" => "Salvataggio ed esportazione", "save" => "Salvataggio ed esportazione",
"tools" => "Strumenti avanzati",
"settings" => "Impostazioni", "settings" => "Impostazioni",
_ => string.Empty _ => string.Empty
}; };
@@ -518,6 +728,7 @@
"data" => "File GIS, misure e POI", "data" => "File GIS, misure e POI",
"projects" => "Salva, apri e visualizza i tuoi lavori", "projects" => "Salva, apri e visualizza i tuoi lavori",
"save" => "Esporta file GIS", "save" => "Esporta file GIS",
"tools" => "Oggetti, geometrie, coordinate e offline",
"settings" => "Mappa, GPS e servizi ufficiali", "settings" => "Mappa, GPS e servizi ufficiali",
_ => string.Empty _ => string.Empty
}; };
@@ -554,6 +765,11 @@
AzureMapsSubscriptionKey = string.Empty; AzureMapsSubscriptionKey = string.Empty;
} }
WebDavEndpoint = Preferences.Default.Get("webdav_endpoint", string.Empty);
WebDavUserName = Preferences.Default.Get("webdav_username", string.Empty);
try { WebDavPassword = await SecureStorage.Default.GetAsync("webdav_password") ?? string.Empty; }
catch { WebDavPassword = string.Empty; }
try try
{ {
Regions = await CatalogService.GetRegionsAsync(); Regions = await CatalogService.GetRegionsAsync();
@@ -570,10 +786,15 @@
{ {
if (firstRender) if (firstRender)
{ {
await JS.InvokeVoidAsync("lmeMap.init"); MapCallbackReference = DotNetObjectReference.Create(this);
await JS.InvokeVoidAsync("lmeMap.init", MapCallbackReference);
await ApplyFlagPreferencesToMapAsync(); await ApplyFlagPreferencesToMapAsync();
await ApplyAdvancedOptions();
await CenterOnInitialLocationAsync(); await CenterOnInitialLocationAsync();
await MigrateLegacyProjectAsync(); await MigrateLegacyProjectAsync();
var offlineCount = await JS.InvokeAsync<int>("lmeMap.getOfflineTileStats");
OfflineStatus = offlineCount == 0 ? "Nessuna tessera salvata." : $"{offlineCount} tessere disponibili offline.";
await InvokeAsync(StateHasChanged);
} }
} }
@@ -693,6 +914,7 @@
private async Task SelectTab(string tab) private async Task SelectTab(string tab)
{ {
NavigationMenuOpen = false;
ActiveTab = tab; ActiveTab = tab;
if (tab != "map") if (tab != "map")
{ {
@@ -710,6 +932,12 @@
} }
} }
private void ToggleNavigationMenu()
{
NavigationMenuOpen = !NavigationMenuOpen;
if (NavigationMenuOpen) LayerPanelOpen = false;
}
private async Task ToggleLayerPanel() private async Task ToggleLayerPanel()
{ {
LayerPanelOpen = !LayerPanelOpen; LayerPanelOpen = !LayerPanelOpen;
@@ -872,8 +1100,16 @@
var label = $"{municipality.Name} - foglio {DisplaySheet(SelectedSheet)}, particella {parcel.Number}"; var label = $"{municipality.Name} - foglio {DisplaySheet(SelectedSheet)}, particella {parcel.Number}";
CatalogBusy = true; CatalogBusy = true;
CatalogMessage = "Scarico il confine dal servizio ufficiale AdE..."; CatalogMessage = "Scarico il confine dal servizio ufficiale AdE...";
var xml = await OfficialCadastreService.GetParcelsNearAsync(parcel.Latitude, parcel.Longitude, 8); ShowSelectedParcels = true;
await JS.InvokeVoidAsync("lmeMap.displayOfficialParcel", xml, parcel.Latitude, parcel.Longitude, parcel.Number, label, true); SaveFlagPreferences();
await JS.InvokeVoidAsync("lmeMap.setSelectedParcelsVisible", true);
var xml = await OfficialCadastreService.GetParcelsNearAsync(parcel.Latitude, parcel.Longitude, 30);
var displayResult = await JS.InvokeAsync<string>("lmeMap.displayOfficialParcel", xml, parcel.Latitude, parcel.Longitude, parcel.Number, label, true);
if (displayResult == "imported")
{
ShowImportedData = true;
SaveFlagPreferences();
}
ActiveTab = "map"; ActiveTab = "map";
await Task.Delay(30); await Task.Delay(30);
await JS.InvokeVoidAsync("lmeMap.resize"); await JS.InvokeVoidAsync("lmeMap.resize");
@@ -1047,6 +1283,61 @@
await JS.InvokeVoidAsync("lmeMap.setDrawingMeasurementsVisible", ShowDrawingMeasurements); 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);
}
[JSInvokable]
public Task OnMapChanged(string action)
{
HasUnsavedChanges = true;
if (AutoSaveOpenProject && SelectedProject is { IsReadOnly: false })
{
ProjectAutoSaveCancellation?.Cancel();
ProjectAutoSaveCancellation?.Dispose();
ProjectAutoSaveCancellation = new CancellationTokenSource();
_ = AutoSaveCurrentProjectAsync(ProjectAutoSaveCancellation.Token);
}
return InvokeAsync(StateHasChanged);
}
[JSInvokable]
public Task OnProjectSaved()
{
HasUnsavedChanges = false;
return InvokeAsync(StateHasChanged);
}
private async Task AutoSaveCurrentProjectAsync(CancellationToken cancellationToken)
{
try
{
await Task.Delay(TimeSpan.FromSeconds(3), cancellationToken);
var project = SelectedProject;
if (project is null || project.IsReadOnly) return;
var snapshot = await JS.InvokeAsync<string>("lmeMap.createProjectSnapshot", IncludeCadastralParcels);
await ProjectStorageService.SaveAsync(project.Name, snapshot, IncludeCadastralParcels, project.Id);
await JS.InvokeVoidAsync("lmeMap.markProjectSaved");
await RefreshProjectsAsync();
}
catch (OperationCanceledException) { }
catch (Exception error)
{
await JS.InvokeVoidAsync("lmeMap.showInfo", $"Autosalvataggio progetto non riuscito: {error.GetBaseException().Message}");
}
}
private async Task ToggleDrawTools() private async Task ToggleDrawTools()
{ {
DrawToolsVisible = !DrawToolsVisible; DrawToolsVisible = !DrawToolsVisible;
@@ -1080,10 +1371,113 @@
} }
} }
private Task SelectProject(ChangeEventArgs args) private async Task SelectProject(ChangeEventArgs args)
{ {
SelectedProjectId = args.Value?.ToString() ?? string.Empty; SelectedProjectId = args.Value?.ToString() ?? string.Empty;
return Task.CompletedTask; ProjectFolder = SelectedProject?.Folder ?? string.Empty;
SelectedVersionId = string.Empty;
ProjectVersions = string.IsNullOrWhiteSpace(SelectedProjectId)
? []
: await ProjectStorageService.GetVersionsAsync(SelectedProjectId);
}
private Task UndoMapChange() => JS.InvokeVoidAsync("lmeMap.undoMapChange").AsTask();
private Task RedoMapChange() => JS.InvokeVoidAsync("lmeMap.redoMapChange").AsTask();
private Task RestoreAutosave() => JS.InvokeVoidAsync("lmeMap.restoreAutosave").AsTask();
private Task SaveGpsMeasurementPoint() => JS.InvokeVoidAsync("lmeMap.saveGpsMeasurementPoint").AsTask();
private async Task ShowTrailStats()
{
var stats = await JS.InvokeAsync<TrailStats>("lmeMap.getGpsTrailStats");
var duration = TimeSpan.FromSeconds(stats.DurationSeconds);
await JS.InvokeVoidAsync("lmeMap.showInfo", $"Traccia: {stats.Points} punti, {stats.Length:0} m, durata {duration:hh\\:mm\\:ss}, {(stats.Recording ? "in registrazione" : "in pausa")}.");
}
private Task ClearGpsTrail() => JS.InvokeVoidAsync("lmeMap.clearGpsTrail").AsTask();
private async Task DuplicateProject()
{
if (SelectedProject is null) return;
var copy = await ProjectStorageService.DuplicateAsync(SelectedProject.Id);
await RefreshProjectsAsync();
SelectedProjectId = copy.Id;
ProjectFolder = copy.Folder;
await JS.InvokeVoidAsync("lmeMap.showInfo", $"Progetto duplicato: {copy.Name}.");
}
private async Task UpdateProjectFolder()
{
if (SelectedProject is null) return;
await ProjectStorageService.UpdateOrganizationAsync(SelectedProject.Id, ProjectFolder);
await RefreshProjectsAsync();
await JS.InvokeVoidAsync("lmeMap.showInfo", "Cartella del progetto aggiornata.");
}
private async Task ToggleProjectArchive()
{
if (SelectedProject is not { } project) return;
await ProjectStorageService.UpdateOrganizationAsync(project.Id, isArchived: !project.IsArchived);
await RefreshProjectsAsync();
await JS.InvokeVoidAsync("lmeMap.showInfo", project.IsArchived ? "Progetto ripristinato." : "Progetto archiviato.");
}
private async Task ShareProject(bool readOnly)
{
if (SelectedProject is null) return;
var path = await ProjectStorageService.CreateProjectPackageAsync(SelectedProject.Id, readOnly);
await Share.Default.RequestAsync(new ShareFileRequest { Title = readOnly ? "Condividi progetto LME in sola lettura" : "Condividi progetto LME modificabile", File = new ShareFile(path, "application/json") });
}
private async Task ShareFullBackup()
{
var path = await ProjectStorageService.CreateBackupAsync();
await Share.Default.RequestAsync(new ShareFileRequest { Title = "Backup completo LME Mappe Catastali", File = new ShareFile(path, "application/zip") });
}
private async Task RestoreBackup()
{
var file = await FilePicker.Default.PickAsync(new PickOptions { PickerTitle = "Scegli backup LME" });
if (file is null) return;
var path = await CopyPickedFileToCacheAsync(file);
var count = await ProjectStorageService.RestoreBackupAsync(path);
await RefreshProjectsAsync();
await JS.InvokeVoidAsync("lmeMap.showInfo", $"Backup ripristinato: {count} progetti disponibili.");
}
private async Task ImportProject()
{
var file = await FilePicker.Default.PickAsync(new PickOptions { PickerTitle = "Scegli progetto LME" });
if (file is null) return;
var path = await CopyPickedFileToCacheAsync(file);
var imported = await ProjectStorageService.ImportProjectAsync(path);
await RefreshProjectsAsync();
SelectedProjectId = imported.Id;
await JS.InvokeVoidAsync("lmeMap.showInfo", $"Progetto importato: {imported.Name}.");
}
private static async Task<string> CopyPickedFileToCacheAsync(FileResult file)
{
var path = Path.Combine(FileSystem.CacheDirectory, $"{Guid.NewGuid():N}-{file.FileName}");
await using var input = await file.OpenReadAsync();
await using var output = File.Create(path);
await input.CopyToAsync(output);
return path;
}
private async Task LoadProjectVersion()
{
if (SelectedProject is null || string.IsNullOrWhiteSpace(SelectedVersionId)) return;
if (!await JS.InvokeAsync<bool>("lmeMap.confirmDiscardChanges", "aprire la revisione")) return;
var snapshot = await ProjectStorageService.LoadVersionAsync(SelectedProject.Id, SelectedVersionId);
var options = await JS.InvokeAsync<ProjectDisplayOptions>("lmeMap.loadProjectSnapshot", snapshot, $"{SelectedProject.Name} - revisione");
ApplyProjectDisplayOptions(options);
ActiveTab = "map";
}
private async Task CompareProjectVersion()
{
if (SelectedProject is null || string.IsNullOrWhiteSpace(SelectedVersionId)) return;
var current = await ProjectStorageService.LoadAsync(SelectedProject.Id);
var previous = await ProjectStorageService.LoadVersionAsync(SelectedProject.Id, SelectedVersionId);
ProjectArchiveMessage = await JS.InvokeAsync<string>("lmeMap.compareProjectSnapshots", current, previous);
} }
private async Task ExportMapFile() private async Task ExportMapFile()
@@ -1105,7 +1499,8 @@
includeCadastral = ExportCadastral, includeCadastral = ExportCadastral,
includeDrawings = ExportDrawings, includeDrawings = ExportDrawings,
includePoi = ExportPoi, includePoi = ExportPoi,
includeTrail = ExportTrail includeTrail = ExportTrail,
selectedOnly = ExportSelectedOnly
}); });
var exported = await MapExportService.CreateAsync(ExportFileName, ExportFormat, geoJson); var exported = await MapExportService.CreateAsync(ExportFileName, ExportFormat, geoJson);
await Share.Default.RequestAsync(new ShareFileRequest await Share.Default.RequestAsync(new ShareFileRequest
@@ -1156,11 +1551,15 @@
await RefreshProjectsAsync(); await RefreshProjectsAsync();
SelectedProjectId = saved.Id; SelectedProjectId = saved.Id;
NewProjectName = saved.Name; NewProjectName = saved.Name;
await JS.InvokeVoidAsync("lmeMap.setProjectReadOnly", false);
await JS.InvokeVoidAsync("lmeMap.markProjectSaved");
HasUnsavedChanges = false;
await CreateAutomaticBackupIfDue();
await JS.InvokeVoidAsync( await JS.InvokeVoidAsync(
"lmeMap.showInfo", "lmeMap.showInfo",
IncludeCadastralParcels IncludeCadastralParcels
? $"Progetto salvato: {saved.Name}, incluse le particelle rosse." ? $"Progetto salvato: {saved.Name}, incluse le particelle catastali evidenziate."
: $"Progetto salvato: {saved.Name}, senza particelle rosse."); : $"Progetto salvato: {saved.Name}, senza particelle catastali evidenziate.");
} }
catch (Exception error) catch (Exception error)
{ {
@@ -1180,6 +1579,7 @@
await JS.InvokeVoidAsync("lmeMap.showInfo", "Seleziona il progetto da caricare."); await JS.InvokeVoidAsync("lmeMap.showInfo", "Seleziona il progetto da caricare.");
return; return;
} }
if (!await JS.InvokeAsync<bool>("lmeMap.confirmDiscardChanges", "aprire un altro progetto")) return;
ProjectBusy = true; ProjectBusy = true;
try try
@@ -1191,6 +1591,9 @@
NewProjectName = project.Name; NewProjectName = project.Name;
ExportFileName = project.Name; ExportFileName = project.Name;
IncludeCadastralParcels = project.IncludesCadastralParcels; IncludeCadastralParcels = project.IncludesCadastralParcels;
await JS.InvokeVoidAsync("lmeMap.setProjectReadOnly", project.IsReadOnly);
await JS.InvokeVoidAsync("lmeMap.markProjectSaved");
HasUnsavedChanges = false;
ActiveTab = "map"; ActiveTab = "map";
await Task.Delay(30); await Task.Delay(30);
await JS.InvokeVoidAsync("lmeMap.resize"); await JS.InvokeVoidAsync("lmeMap.resize");
@@ -1256,6 +1659,115 @@
ProjectBusy = false; ProjectBusy = false;
} }
} }
private Task ShowObjectTable() => JS.InvokeVoidAsync("lmeMap.showObjectTable").AsTask();
private Task ShowAuditLog() => JS.InvokeVoidAsync("lmeMap.showAuditLog").AsTask();
private Task ShowCoordinateInspector() => JS.InvokeVoidAsync("lmeMap.showCoordinateInspector").AsTask();
private Task ValidateSelectedGeometries() => JS.InvokeVoidAsync("lmeMap.validateAndRepairSelected").AsTask();
private Task CreateSelectedHole() => JS.InvokeVoidAsync("lmeMap.createHoleFromSelected").AsTask();
private Task CompareSelectedGeometries() => JS.InvokeVoidAsync("lmeMap.compareSelectedGeometries").AsTask();
private Task RestoreTrashItem() => JS.InvokeVoidAsync("lmeMap.restoreLastTrashItem").AsTask();
private Task EmptyTrash() => JS.InvokeVoidAsync("lmeMap.emptyTrash").AsTask();
private async Task DownloadOfflineArea()
{
OfflineBusy = true;
try
{
var result = await JS.InvokeAsync<OfflineDownloadResult>("lmeMap.downloadOfflineArea", OfflineExtraZoomLevels);
OfflineStatus = $"{result.Saved} tessere disponibili, zoom {result.StartZoom}-{result.EndZoom}.";
}
catch (Exception error) { OfflineStatus = $"Download non riuscito: {error.GetBaseException().Message}"; }
finally { OfflineBusy = false; }
}
private async Task UseOfflineMap()
{
await JS.InvokeVoidAsync("lmeMap.setBaseLayer", "offline");
SelectedBaseLayer = "offline";
}
private async Task ClearOfflineArea()
{
if (!await JS.InvokeAsync<bool>("confirm", "Svuotare tutte le mappe salvate offline?")) return;
await JS.InvokeVoidAsync("lmeMap.clearOfflineTiles");
OfflineStatus = "Nessuna tessera salvata.";
}
private async Task SaveWebDavSettings()
{
Preferences.Default.Set("webdav_endpoint", WebDavEndpoint.Trim());
Preferences.Default.Set("webdav_username", WebDavUserName.Trim());
if (string.IsNullOrWhiteSpace(WebDavPassword)) SecureStorage.Default.Remove("webdav_password");
else await SecureStorage.Default.SetAsync("webdav_password", WebDavPassword);
SyncStatus = "Configurazione WebDAV salvata sul dispositivo.";
}
private async Task SyncUpload()
{
SyncBusy = true;
try
{
await SaveWebDavSettings();
var backup = await ProjectStorageService.CreateBackupAsync();
await CloudSyncService.UploadAsync(WebDavEndpoint, WebDavUserName, WebDavPassword, backup);
SyncStatus = $"Archivio inviato al cloud il {DateTime.Now:dd/MM/yyyy HH:mm}.";
}
catch (Exception error) { SyncStatus = $"Invio non riuscito: {error.GetBaseException().Message}"; }
finally { SyncBusy = false; }
}
private async Task SyncDownload()
{
if (!await JS.InvokeAsync<bool>("lmeMap.confirmDiscardChanges", "ripristinare l'archivio cloud")) return;
SyncBusy = true;
try
{
await SaveWebDavSettings();
var backup = await CloudSyncService.DownloadAsync(WebDavEndpoint, WebDavUserName, WebDavPassword);
var count = await ProjectStorageService.RestoreBackupAsync(backup);
await RefreshProjectsAsync();
SyncStatus = $"Sincronizzazione completata: {count} progetti ripristinati.";
}
catch (Exception error) { SyncStatus = $"Download non riuscito: {error.GetBaseException().Message}"; }
finally { SyncBusy = false; }
}
private async Task CheckForUpdates()
{
UpdateBusy = true;
UpdateDownloadUrl = string.Empty;
UpdateReleaseNotes = string.Empty;
try
{
var update = await AppUpdateService.CheckAsync();
UpdateReleaseNotes = update.ReleaseNotes;
if (update.IsAvailable)
{
UpdateStatus = $"Installata {AppUpdateService.CurrentVersion}. Disponibile {update.Version}.";
UpdateDownloadUrl = update.DownloadUrl;
}
else UpdateStatus = $"Versione {AppUpdateService.CurrentVersion} aggiornata. Ultima release Gitea: {update.Version}.";
}
catch (Exception error) { UpdateStatus = $"Controllo non riuscito: {error.GetBaseException().Message}"; }
finally { UpdateBusy = false; }
}
private Task OpenUpdateDownload() => string.IsNullOrWhiteSpace(UpdateDownloadUrl)
? Task.CompletedTask
: Launcher.Default.OpenAsync(new Uri(UpdateDownloadUrl));
private async Task CreateAutomaticBackupIfDue()
{
if (AutomaticBackupFrequency == "off") return;
var latest = ProjectStorageService.GetLatestScheduledBackupTime();
var interval = AutomaticBackupFrequency == "weekly" ? TimeSpan.FromDays(7) : TimeSpan.FromDays(1);
if (latest is null || DateTimeOffset.UtcNow - latest.Value.ToUniversalTime() >= interval)
{
await ProjectStorageService.CreateScheduledBackupAsync();
}
}
private Task CenterOnGps() => JS.InvokeVoidAsync("lmeMap.centerOnGps").AsTask(); private Task CenterOnGps() => JS.InvokeVoidAsync("lmeMap.centerOnGps").AsTask();
private async Task ApplyTrailOption() private async Task ApplyTrailOption()
{ {
@@ -1386,6 +1898,16 @@
ExportDrawings = GetFlagPreference("export_drawings", true); ExportDrawings = GetFlagPreference("export_drawings", true);
ExportPoi = GetFlagPreference("export_poi", true); ExportPoi = GetFlagPreference("export_poi", true);
ExportTrail = GetFlagPreference("export_trail", true); ExportTrail = GetFlagPreference("export_trail", true);
ExportSelectedOnly = GetFlagPreference("export_selected_only", false);
AutoSaveEnabled = GetFlagPreference("auto_save", true);
AutoSaveOpenProject = GetFlagPreference("auto_save_project", false);
AutomaticBackupFrequency = Preferences.Default.Get($"{FlagPreferencePrefix}backup_frequency", "daily");
SnapEnabled = GetFlagPreference("snap_enabled", true);
AutoFitSelectedObject = GetFlagPreference("auto_fit_selected_object", false);
SnapDistancePixels = Preferences.Default.Get($"{FlagPreferencePrefix}snap_distance", 14);
OfflineExtraZoomLevels = Preferences.Default.Get($"{FlagPreferencePrefix}offline_zoom_levels", 2);
GpsProximityEnabled = GetFlagPreference("gps_proximity", true);
GpsBoundaryAlertEnabled = GetFlagPreference("gps_boundary_alert", false);
foreach (var layer in CadastralLayers) foreach (var layer in CadastralLayers)
{ {
@@ -1411,6 +1933,16 @@
SetFlagPreference("export_drawings", ExportDrawings); SetFlagPreference("export_drawings", ExportDrawings);
SetFlagPreference("export_poi", ExportPoi); SetFlagPreference("export_poi", ExportPoi);
SetFlagPreference("export_trail", ExportTrail); SetFlagPreference("export_trail", ExportTrail);
SetFlagPreference("export_selected_only", ExportSelectedOnly);
SetFlagPreference("auto_save", AutoSaveEnabled);
SetFlagPreference("auto_save_project", AutoSaveOpenProject);
Preferences.Default.Set($"{FlagPreferencePrefix}backup_frequency", AutomaticBackupFrequency);
SetFlagPreference("snap_enabled", SnapEnabled);
SetFlagPreference("auto_fit_selected_object", AutoFitSelectedObject);
Preferences.Default.Set($"{FlagPreferencePrefix}snap_distance", SnapDistancePixels);
Preferences.Default.Set($"{FlagPreferencePrefix}offline_zoom_levels", OfflineExtraZoomLevels);
SetFlagPreference("gps_proximity", GpsProximityEnabled);
SetFlagPreference("gps_boundary_alert", GpsBoundaryAlertEnabled);
foreach (var layer in CadastralLayers) foreach (var layer in CadastralLayers)
{ {
@@ -1436,6 +1968,20 @@
} }
} }
private async Task ApplyAdvancedOptions()
{
SaveFlagPreferences();
await JS.InvokeVoidAsync("lmeMap.setAdvancedOptions", new
{
autoSaveEnabled = AutoSaveEnabled,
snapEnabled = SnapEnabled,
autoFitSelectedObject = AutoFitSelectedObject,
snapDistancePixels = SnapDistancePixels,
gpsProximityEnabled = GpsProximityEnabled,
gpsBoundaryAlertEnabled = GpsBoundaryAlertEnabled
});
}
private static bool GetFlagPreference(string name, bool defaultValue) => private static bool GetFlagPreference(string name, bool defaultValue) =>
Preferences.Default.Get($"{FlagPreferencePrefix}{name}", defaultValue); Preferences.Default.Get($"{FlagPreferencePrefix}{name}", defaultValue);
@@ -1497,12 +2043,31 @@
public bool TrailEnabled { get; init; } public bool TrailEnabled { get; init; }
} }
private sealed class OfflineDownloadResult
{
public int Saved { get; init; }
public int Requested { get; init; }
public int StartZoom { get; init; }
public int EndZoom { get; init; }
}
private sealed class TrailStats
{
public int Points { get; init; }
public double Length { get; init; }
public int DurationSeconds { get; init; }
public bool Recording { get; init; }
}
public ValueTask DisposeAsync() public ValueTask DisposeAsync()
{ {
CancelCatalogWork(); CancelCatalogWork();
LocationService.StopTracking(); LocationService.StopTracking();
GpsLookupCancellation?.Cancel(); GpsLookupCancellation?.Cancel();
GpsLookupCancellation?.Dispose(); GpsLookupCancellation?.Dispose();
ProjectAutoSaveCancellation?.Cancel();
ProjectAutoSaveCancellation?.Dispose();
MapCallbackReference?.Dispose();
return ValueTask.CompletedTask; return ValueTask.CompletedTask;
} }
} }
+3 -2
View File
@@ -28,8 +28,9 @@
<ApplicationId>com.companyname.lmemappecatastaliapp</ApplicationId> <ApplicationId>com.companyname.lmemappecatastaliapp</ApplicationId>
<!-- Versions --> <!-- Versions -->
<ApplicationDisplayVersion>0.2.20</ApplicationDisplayVersion> <ApplicationDisplayVersion>0.4.4</ApplicationDisplayVersion>
<ApplicationVersion>24</ApplicationVersion> <ApplicationVersion>39</ApplicationVersion>
<Version>$(ApplicationDisplayVersion)</Version>
<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged --> <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
<WindowsPackageType>None</WindowsPackageType> <WindowsPackageType>None</WindowsPackageType>
+2
View File
@@ -24,6 +24,8 @@ public static class MauiProgram
builder.Services.AddSingleton<AzureMapsService>(); builder.Services.AddSingleton<AzureMapsService>();
builder.Services.AddSingleton<ProjectStorageService>(); builder.Services.AddSingleton<ProjectStorageService>();
builder.Services.AddSingleton<MapExportService>(); builder.Services.AddSingleton<MapExportService>();
builder.Services.AddSingleton<CloudSyncService>();
builder.Services.AddSingleton<AppUpdateService>();
#if DEBUG #if DEBUG
builder.Services.AddBlazorWebViewDeveloperTools(); builder.Services.AddBlazorWebViewDeveloperTools();
+60 -5
View File
@@ -2,7 +2,62 @@
App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata per consultare mappe catastali e lavorare sul campo con GPS. App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata per consultare mappe catastali e lavorare sul campo con GPS.
## Funzioni gia implementate ## Versione 0.4.4
- I comandi `Rinomina`, `Sposta nel gruppo` e `Rimuovi` occupano una riga completa e restano visibili anche nei pannelli Layer molto stretti.
- `Sposta nel gruppo` e disponibile per padri e figli di disegni, dati importati, cornici, fogli importati e particelle evidenziate dalla ricerca catastale.
- Editor distinti per linea e riempimento su gruppi e singoli oggetti, con contagocce dove supportato e valori modificabili HEX, RGB e HSL.
- Copia HEX per riutilizzare esattamente un colore su altri oggetti; stili conservati nei progetti e negli export.
- Rimossi dai menu i riferimenti al colore rosso fisso delle particelle catastali.
- Nei progetti in sola lettura anche il trasferimento tra gruppi viene correttamente disabilitato.
## Versione 0.4.3
- `Mostra particella sulla mappa` riattiva sempre il layer dei confini rossi e lo porta in primo piano.
- Una particella gia evidenziata o temporaneamente nascosta viene recuperata senza creare duplicati.
- Deduplicazione estesa alle particelle presenti in progetti e file GeoJSON, KML e KMZ, tramite riferimenti catastali o confronto geometrico.
- Ricerca WFS ampliata per rendere piu affidabile il recupero dei confini di particelle estese o irregolari.
- Guida rapida collassabile in fondo a Layer e a ogni pannello operativo, con istruzioni specifiche per le relative funzioni.
## Versione 0.4.2
- Nuovo comando `Sposta nel gruppo` visibile accanto a Rinomina e Rimuovi per padri, sottogruppi e singoli oggetti.
- Scelta della categoria e del sottogruppo di destinazione, con possibilita di creare un nuovo gruppo.
- I disegni possono essere organizzati in sottogruppi come i dati importati.
- `Sposta geometria` resta separato e continua a traslare gli oggetti in metri verso nord, sud, est o ovest.
## Versione 0.4.1
- Pannelli operativi allineati a destra, con ricerca lasciata nella posizione precedente.
- Espansione della gerarchia Layer esclusivamente tramite freccia accanto alla maniglia di trascinamento.
- Colori coerenti tra gruppo padre e figli, intensita progressiva per livello e conteggio figli in grassetto.
- Spostamento dei gruppi tra `Disegni e POI` e `Progetti e dati importati`.
- Rinomine persistenti nei progetti e negli export GeoJSON, KML e KMZ.
- Gli oggetti e i gruppi rimossi dal progetto non vengono piu inclusi nei salvataggi e negli export.
- Editor interni per rinomina, attributi multilinea, coordinate, spostamento e buffer.
- Selezione multipla e blocco disponibili anche nella tabella oggetti e particelle.
- Evidenziazione nel Layer dell'oggetto selezionato sulla mappa e centratura automatica opzionale, disattivata per impostazione predefinita.
- Strumenti controllo/riparazione, foro e confronto nella barra Leaflet, con risultati visibili in una finestra dedicata.
- Comandi del pannello Progetti disposti verticalmente senza scorrimento orizzontale.
## Versione 0.4.0
La mappa ora occupa tutta la schermata: il pannello `Layer` resta subito accessibile, mentre ricerca, catasto, dati, progetti, esportazione, strumenti avanzati e impostazioni sono raccolti nel menu in alto.
Tra le funzioni principali della versione 0.4.0:
- rinomina, ordinamento, selezione, blocco e rimozione reversibile di singoli oggetti e gruppi;
- evidenziazione coordinata dei gruppi e gerarchia visiva tra padri, figli e livelli annidati;
- annulla/ripristina, cestino, storico modifiche, autosalvataggio e backup programmati;
- modifica o eliminazione del solo disegno selezionato oppure di tutti i disegni;
- tabella oggetti, ricerca, attributi personalizzati, etichette, note e foto;
- strumenti geometrici per buffer, unione, divisione, fori, confronto e controllo/riparazione;
- importazione controllata di GeoJSON, KML e KMZ con analisi, pulizia e deduplicazione;
- cache cartografica offline, sincronizzazione WebDAV e condivisione di progetti modificabili o in sola lettura;
- controllo aggiornamenti da Gitea con versione installata, versione disponibile, note e download APK;
- esportazione PDF con schema vettoriale, freccia nord, scala grafica e riferimenti catastali.
## Funzioni implementate
- Mappa interattiva Leaflet con sfondi Esri, OpenStreetMap, OpenTopoMap, CARTO Voyager, Google Maps e Azure Maps configurabili tramite chiave. - 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. - Layer WMS ufficiale Agenzia delle Entrate: particelle, numeri particella, fogli, fabbricati, strade e acque.
@@ -14,11 +69,11 @@ App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata pe
- Migrazione automatica dei vecchi progetti: i GroundOverlay `DOC_...` salvati in precedenza insieme alle particelle vengono riconosciuti, separati e nascosti in tempo reale dal relativo check. - Migrazione automatica dei vecchi progetti: i GroundOverlay `DOC_...` salvati in precedenza insieme alle particelle vengono riconosciuti, separati e nascosti in tempo reale dal relativo check.
- Inquadramento e pulizia dei layer importati. - Inquadramento e pulizia dei layer importati.
- Disegno di marker, linee, poligoni e rettangoli. - Disegno di marker, linee, poligoni e rettangoli.
- Area, Distanza e Cerchio disponibili nella barra Leaflet laterale, nascosta all'avvio e controllata dal pulsante nel tab Dati insieme agli altri strumenti. - Area, Distanza e Cerchio disponibili nella barra Leaflet laterale, nascosta all'avvio e controllata dalla sezione `Dati e disegni` insieme agli altri strumenti.
- Misure permanenti attivabili anche sui layer importati da KML, KMZ e GeoJSON. - Misure permanenti attivabili anche sui layer importati da KML, KMZ e GeoJSON.
- Toolbar di disegno completa di icone, modifica, eliminazione singola e pulizia di tutti i disegni/POI. - Toolbar di disegno completa di icone, modifica, eliminazione singola e pulizia di tutti i disegni/POI.
- Archivio multiprogetto nella cartella privata dell'app, con nome, selezione da elenco, sovrascrittura ed eliminazione. - Archivio multiprogetto nella cartella privata dell'app, con nome, selezione da elenco, sovrascrittura ed eliminazione.
- Tab distinti `Progetti` e `Salvataggio`: il primo gestisce archivio e opzioni live di visualizzazione, il secondo esporta selettivamente l'intera mappa in GeoJSON, KML o KMZ. - Sezioni `Progetti` ed `Esporta` nel menu: la prima gestisce archivio e opzioni live di visualizzazione, la seconda esporta selettivamente l'intera mappa in GeoJSON, KML o KMZ.
- Ogni progetto salva file GIS, POI, disegni, traccia, inquadratura e tutte le opzioni di visualizzazione: sfondo, layer catastali, trasparenza, misure, foglio importato, barra strumenti e preferenze GPS. - Ogni progetto salva file GIS, POI, disegni, traccia, inquadratura e tutte le opzioni di visualizzazione: sfondo, layer catastali, trasparenza, misure, foglio importato, barra strumenti e preferenze GPS.
- GPS nativo MAUI ad alta precisione con permessi Android/iOS. - GPS nativo MAUI ad alta precisione con permessi Android/iOS.
- Centratura automatica una tantum all'apertura: prima tramite posizione approssimativa della connessione Internet, poi tramite singola lettura GPS se la rete non restituisce una posizione; nessun punto o cerchio viene mostrato e il tracking continuo non viene avviato. - Centratura automatica una tantum all'apertura: prima tramite posizione approssimativa della connessione Internet, poi tramite singola lettura GPS se la rete non restituisce una posizione; nessun punto o cerchio viene mostrato e il tracking continuo non viene avviato.
@@ -26,13 +81,13 @@ App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata pe
- Marker posizione, cerchio accuratezza in metri, tracciamento percorso. - Marker posizione, cerchio accuratezza in metri, tracciamento percorso.
- Controllo se la posizione GPS cade dentro un poligono importato o disegnato. - Controllo se la posizione GPS cade dentro un poligono importato o disegnato.
- Interrogazione WFS ufficiale Agenzia delle Entrate attorno alla posizione GPS per evidenziare la particella catastale corrente quando il servizio restituisce la geometria. - Interrogazione WFS ufficiale Agenzia delle Entrate attorno alla posizione GPS per evidenziare la particella catastale corrente quando il servizio restituisce la geometria.
- Mappa a tutto schermo con tab separati Catasto, Dati, Salvataggio e Impostazioni, adattabile agli schermi pieghevoli. - Mappa a tutto schermo con menu compatto e pannelli adattabili a telefoni, tablet e schermi pieghevoli.
- Ingrandimento oltre lo zoom satellitare nativo senza tessere "Map data not yet available". - Ingrandimento oltre lo zoom satellitare nativo senza tessere "Map data not yet available".
- Tendine concatenate Regione, Comune, Foglio e Particella. - Tendine concatenate Regione, Comune, Foglio e Particella.
- Ricerca di localita e indirizzi eseguita nativamente con fallback Esri e OpenStreetMap, senza richieste CORS dalla WebView. - Ricerca di localita e indirizzi eseguita nativamente con fallback Esri e OpenStreetMap, senza richieste CORS dalla WebView.
- Catalogo dei Comuni incluso nell'APK e cataloghi regionali OnData scaricati in cache solo quando servono. - 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. - 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 completa puo' essere mostrata o nascosta dal tab Dati. - La registrazione della traccia GPS e' disattivata all'avvio; la toolbar di disegno completa puo' essere mostrata o nascosta dalla sezione `Dati e disegni`.
- Pannello `Layer` accessibile direttamente dalla mappa, con checkbox sincronizzati per confini, numeri particella, fogli, fabbricati, strade e acque. - 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. - 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. - Comandi separati per rimuovere le particelle selezionate o pulire importazioni, disegni, POI e traccia GPS.
+44
View File
@@ -0,0 +1,44 @@
using System.Net.Http.Json;
using System.Reflection;
using System.Text.Json.Serialization;
namespace LMEMappeCatastaliApp.Services;
public sealed class AppUpdateService
{
private const string LatestReleaseUrl = "https://gitea.lmcloud.it/api/v1/repos/livio/LMEMappeCatastaliApp/releases/latest";
private readonly HttpClient _httpClient = new() { Timeout = TimeSpan.FromSeconds(20) };
public static string CurrentVersion =>
typeof(AppUpdateService).Assembly
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
.InformationalVersion.Split('+')[0]
?? AppInfo.Current.VersionString;
public async Task<AppUpdateResult> CheckAsync(CancellationToken cancellationToken = default)
{
var release = await _httpClient.GetFromJsonAsync<GiteaRelease>(LatestReleaseUrl, cancellationToken)
?? throw new InvalidDataException("Risposta aggiornamenti non valida.");
var latestText = (release.TagName ?? string.Empty).TrimStart('v', 'V');
_ = Version.TryParse(CurrentVersion, out var current);
_ = Version.TryParse(latestText, out var latest);
var apk = release.Assets?.FirstOrDefault(item => item.Name?.EndsWith(".apk", StringComparison.OrdinalIgnoreCase) == true);
return new(latest is not null && current is not null && latest > current, latestText, release.HtmlUrl ?? string.Empty, apk?.BrowserDownloadUrl ?? release.HtmlUrl ?? string.Empty, release.Body ?? string.Empty);
}
private sealed class GiteaRelease
{
[JsonPropertyName("tag_name")] public string? TagName { get; set; }
[JsonPropertyName("html_url")] public string? HtmlUrl { get; set; }
[JsonPropertyName("assets")] public GiteaAsset[]? Assets { get; set; }
[JsonPropertyName("body")] public string? Body { get; set; }
}
private sealed class GiteaAsset
{
[JsonPropertyName("name")] public string? Name { get; set; }
[JsonPropertyName("browser_download_url")] public string? BrowserDownloadUrl { get; set; }
}
}
public sealed record AppUpdateResult(bool IsAvailable, string Version, string ReleaseUrl, string DownloadUrl, string ReleaseNotes);
+1 -1
View File
@@ -13,7 +13,7 @@ public sealed class AzureMapsService
public AzureMapsService() public AzureMapsService()
{ {
_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.20"); _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
_httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/json"); _httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/json");
} }
+54
View File
@@ -0,0 +1,54 @@
using System.Net.Http.Headers;
using System.Text;
namespace LMEMappeCatastaliApp.Services;
public sealed class CloudSyncService
{
private readonly HttpClient _httpClient = new() { Timeout = TimeSpan.FromMinutes(3) };
public async Task UploadAsync(string endpoint, string userName, string password, string localPath, CancellationToken cancellationToken = default)
{
var target = BuildTarget(endpoint);
using var request = new HttpRequestMessage(HttpMethod.Put, target);
ApplyCredentials(request, userName, password);
request.Content = new StreamContent(File.OpenRead(localPath));
request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/zip");
using var response = await _httpClient.SendAsync(request, cancellationToken);
response.EnsureSuccessStatusCode();
}
public async Task<string> DownloadAsync(string endpoint, string userName, string password, CancellationToken cancellationToken = default)
{
using var request = new HttpRequestMessage(HttpMethod.Get, BuildTarget(endpoint));
ApplyCredentials(request, userName, password);
using var response = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
response.EnsureSuccessStatusCode();
var directory = Path.Combine(FileSystem.CacheDirectory, "CloudSync");
Directory.CreateDirectory(directory);
var path = Path.Combine(directory, $"LME-cloud-{DateTime.Now:yyyyMMdd-HHmmss}.lmebackup.zip");
await using var input = await response.Content.ReadAsStreamAsync(cancellationToken);
await using var output = File.Create(path);
await input.CopyToAsync(output, cancellationToken);
return path;
}
private static Uri BuildTarget(string endpoint)
{
if (!Uri.TryCreate(endpoint?.Trim(), UriKind.Absolute, out var uri)
|| (uri.Scheme != Uri.UriSchemeHttps && uri.Scheme != Uri.UriSchemeHttp))
{
throw new ArgumentException("Inserisci un indirizzo WebDAV http o https valido.");
}
return uri.AbsolutePath.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)
? uri
: new Uri($"{uri.ToString().TrimEnd('/')}/LMEMappeCatastali-sync.lmebackup.zip");
}
private static void ApplyCredentials(HttpRequestMessage request, string userName, string password)
{
if (string.IsNullOrWhiteSpace(userName)) return;
var value = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{userName}:{password}"));
request.Headers.Authorization = new AuthenticationHeaderValue("Basic", value);
}
}
+246 -2
View File
@@ -35,6 +35,8 @@ public sealed class MapExportService
{ {
"kml" => "kml", "kml" => "kml",
"kmz" => "kmz", "kmz" => "kmz",
"gpx" => "gpx",
"pdf" => "pdf",
_ => "geojson" _ => "geojson"
}; };
var baseName = NormalizeFileName(requestedName); var baseName = NormalizeFileName(requestedName);
@@ -49,6 +51,18 @@ public sealed class MapExportService
return new(path, "application/geo+json", featureCount, Path.GetFileName(path)); return new(path, "application/geo+json", featureCount, Path.GetFileName(path));
} }
if (format == "gpx")
{
await File.WriteAllTextAsync(path, BuildGpx(features, baseName), new UTF8Encoding(false), cancellationToken);
return new(path, "application/gpx+xml", featureCount, Path.GetFileName(path));
}
if (format == "pdf")
{
await File.WriteAllBytesAsync(path, BuildPdfReport(features, baseName), cancellationToken);
return new(path, "application/pdf", featureCount, Path.GetFileName(path));
}
var kml = BuildKml(features, baseName); var kml = BuildKml(features, baseName);
if (format == "kml") if (format == "kml")
{ {
@@ -67,6 +81,173 @@ public sealed class MapExportService
return new(path, "application/vnd.google-earth.kmz", featureCount, Path.GetFileName(path)); return new(path, "application/vnd.google-earth.kmz", featureCount, Path.GetFileName(path));
} }
private static string BuildGpx(JsonElement features, string name)
{
var root = new XElement("gpx",
new XAttribute("version", "1.1"),
new XAttribute("creator", "LME Mappe Catastali 0.4.4"),
new XAttribute(XNamespace.Xmlns + "xsi", "http://www.w3.org/2001/XMLSchema-instance"),
new XElement("metadata", new XElement("name", name)));
foreach (var feature in features.EnumerateArray())
{
if (!feature.TryGetProperty("geometry", out var geometry) || geometry.ValueKind != JsonValueKind.Object) continue;
var properties = feature.TryGetProperty("properties", out var value) ? value : default;
var featureName = FeatureName(properties, GetString(properties, "_lmeCategory") ?? "drawing");
var type = geometry.GetProperty("type").GetString();
var coordinates = geometry.GetProperty("coordinates");
if (type == "Point")
{
root.Add(GpxPoint("wpt", coordinates, featureName));
}
else
{
foreach (var line in EnumerateGpxLines(type, coordinates))
{
root.Add(new XElement("trk", new XElement("name", featureName),
new XElement("trkseg", line.Select(point => GpxPoint("trkpt", point, null)))));
}
}
}
return new XDocument(new XDeclaration("1.0", "utf-8", null), root).ToString();
}
private static XElement GpxPoint(string element, JsonElement coordinate, string? name)
{
var values = coordinate.EnumerateArray().ToArray();
var point = new XElement(element,
new XAttribute("lat", values[1].GetDouble().ToString("G17", CultureInfo.InvariantCulture)),
new XAttribute("lon", values[0].GetDouble().ToString("G17", CultureInfo.InvariantCulture)));
if (!string.IsNullOrWhiteSpace(name)) point.Add(new XElement("name", name));
return point;
}
private static IEnumerable<JsonElement[]> EnumerateGpxLines(string? type, JsonElement coordinates)
{
if (type == "LineString") yield return coordinates.EnumerateArray().ToArray();
else if (type == "Polygon")
foreach (var ring in coordinates.EnumerateArray()) yield return ring.EnumerateArray().ToArray();
else if (type == "MultiLineString")
foreach (var line in coordinates.EnumerateArray()) yield return line.EnumerateArray().ToArray();
else if (type == "MultiPolygon")
foreach (var polygon in coordinates.EnumerateArray())
foreach (var ring in polygon.EnumerateArray()) yield return ring.EnumerateArray().ToArray();
}
private static byte[] BuildPdfReport(JsonElement features, string title)
{
var paths = features.EnumerateArray()
.Where(feature => feature.TryGetProperty("geometry", out _))
.SelectMany(feature => PdfCoordinatePaths(feature.GetProperty("geometry")))
.Where(path => path.Count > 0)
.ToArray();
var points = paths.SelectMany(path => path).ToArray();
var minLon = points.Length == 0 ? 0 : points.Min(point => point.Lon);
var maxLon = points.Length == 0 ? 1 : points.Max(point => point.Lon);
var minLat = points.Length == 0 ? 0 : points.Min(point => point.Lat);
var maxLat = points.Length == 0 ? 1 : points.Max(point => point.Lat);
var lonSpan = Math.Max(0.0000001, maxLon - minLon);
var latSpan = Math.Max(0.0000001, maxLat - minLat);
const double mapLeft = 48, mapBottom = 438, mapWidth = 499, mapHeight = 330;
var scale = Math.Min(mapWidth / lonSpan, mapHeight / latSpan);
var drawing = new StringBuilder("0.08 0.44 0.37 RG 0.86 0.94 0.91 rg 1.4 w ");
foreach (var path in paths.Take(400))
{
for (var pointIndex = 0; pointIndex < path.Count; pointIndex++)
{
var x = mapLeft + (path[pointIndex].Lon - minLon) * scale;
var y = mapBottom + (path[pointIndex].Lat - minLat) * scale;
drawing.AppendFormat(CultureInfo.InvariantCulture, "{0:0.##} {1:0.##} {2} ", x, y, pointIndex == 0 ? "m" : "l");
}
drawing.Append("S ");
}
drawing.Append("0 0 0 RG 1 w 497 730 m 497 758 l S 497 758 m 491 746 l 503 746 l h f ");
var middleLatitude = (minLat + maxLat) / 2;
var widthMeters = lonSpan * 111_320 * Math.Cos(middleLatitude * Math.PI / 180);
var scaleMeters = Math.Max(1, NiceScaleDistance(widthMeters / 4));
var scalePixels = widthMeters <= 0 ? 80 : Math.Clamp(scaleMeters / widthMeters * mapWidth, 35, 150);
drawing.AppendFormat(CultureInfo.InvariantCulture, "48 422 m {0:0.##} 422 l S 48 418 m 48 426 l S {0:0.##} 418 m {0:0.##} 426 l S ", 48 + scalePixels);
var lines = new List<string>
{
title,
$"Rapporto LME Mappe Catastali - {DateTime.Now:dd/MM/yyyy HH:mm}",
$"Oggetti: {features.GetArrayLength()}",
$"Scala grafica: {scaleMeters:0} m | Nord: alto pagina",
""
};
var index = 1;
foreach (var feature in features.EnumerateArray())
{
var properties = feature.TryGetProperty("properties", out var value) ? value : default;
var category = GetString(properties, "_lmeCategory") ?? "drawing";
var geometry = feature.TryGetProperty("geometry", out var geo) ? geo.GetProperty("type").GetString() : "-";
var sheet = GetString(properties, "foglio") ?? GetString(properties, "FOGLIO");
var parcel = GetString(properties, "particella") ?? GetString(properties, "PARTICELLA") ?? GetString(properties, "LABEL");
var reference = string.Join(" ", new[] { sheet is null ? null : $"F.{sheet}", parcel is null ? null : $"P.{parcel}" }.Where(item => item is not null));
lines.Add($"{index++}. {FeatureName(properties, category)} [{category}, {geometry}] {reference}".TrimEnd());
}
var content = drawing.Append("BT /F1 12 Tf 48 810 Td ");
foreach (var line in lines.Take(21))
{
var safe = line.Replace("\\", "\\\\").Replace("(", "\\(").Replace(")", "\\)")
.Select(character => character <= 255 ? character : '?').ToArray();
content.Append('(').Append(safe).Append(") Tj 0 -16 Td ");
}
content.Append("ET");
var stream = Encoding.Latin1.GetBytes(content.ToString());
var objects = new[]
{
"<< /Type /Catalog /Pages 2 0 R >>",
"<< /Type /Pages /Kids [3 0 R] /Count 1 >>",
"<< /Type /Page /Parent 2 0 R /MediaBox [0 0 595 842] /Resources << /Font << /F1 5 0 R >> >> /Contents 4 0 R >>",
$"<< /Length {stream.Length} >>\nstream\n{Encoding.Latin1.GetString(stream)}\nendstream",
"<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>"
};
using var output = new MemoryStream();
using var writer = new StreamWriter(output, Encoding.Latin1, leaveOpen: true) { NewLine = "\n" };
writer.Write("%PDF-1.4\n"); writer.Flush();
var offsets = new List<long> { 0 };
for (var i = 0; i < objects.Length; i++)
{
offsets.Add(output.Position); writer.Write($"{i + 1} 0 obj\n{objects[i]}\nendobj\n"); writer.Flush();
}
var xref = output.Position;
writer.Write($"xref\n0 {objects.Length + 1}\n0000000000 65535 f \n");
foreach (var offset in offsets.Skip(1)) writer.Write($"{offset:0000000000} 00000 n \n");
writer.Write($"trailer << /Size {objects.Length + 1} /Root 1 0 R >>\nstartxref\n{xref}\n%%EOF");
writer.Flush();
return output.ToArray();
}
private static double NiceScaleDistance(double value)
{
if (value <= 0) return 1;
var power = Math.Pow(10, Math.Floor(Math.Log10(value)));
var normalized = value / power;
var nice = normalized >= 5 ? 5 : normalized >= 2 ? 2 : 1;
return nice * power;
}
private static IEnumerable<List<(double Lon, double Lat)>> PdfCoordinatePaths(JsonElement geometry)
{
if (!geometry.TryGetProperty("type", out var typeElement) || !geometry.TryGetProperty("coordinates", out var coordinates)) yield break;
var type = typeElement.GetString();
if (type == "Point") { yield return [PdfPoint(coordinates)]; yield break; }
if (type == "LineString") { yield return coordinates.EnumerateArray().Select(PdfPoint).ToList(); yield break; }
if (type == "Polygon" || type == "MultiLineString")
{
foreach (var path in coordinates.EnumerateArray()) yield return path.EnumerateArray().Select(PdfPoint).ToList();
yield break;
}
if (type == "MultiPolygon")
{
foreach (var polygon in coordinates.EnumerateArray())
foreach (var path in polygon.EnumerateArray()) yield return path.EnumerateArray().Select(PdfPoint).ToList();
}
}
private static (double Lon, double Lat) PdfPoint(JsonElement coordinate) =>
(coordinate[0].GetDouble(), coordinate[1].GetDouble());
private static string BuildKml(JsonElement features, string documentName) private static string BuildKml(JsonElement features, string documentName)
{ {
var document = new XElement(Kml + "Document", var document = new XElement(Kml + "Document",
@@ -78,6 +259,8 @@ public sealed class MapExportService
BuildStyle("drawing", "ff1679f9", "333c92fb"), BuildStyle("drawing", "ff1679f9", "333c92fb"),
BuildStyle("poi", "ffff7a00", "33ff7a00"), BuildStyle("poi", "ffff7a00", "33ff7a00"),
BuildStyle("gps-trail", "ff00a5ff", "2200a5ff")); BuildStyle("gps-trail", "ff00a5ff", "2200a5ff"));
var categoryFolders = new Dictionary<string, XElement>(StringComparer.Ordinal);
var groupFolders = new Dictionary<(string Category, string Group), XElement>();
foreach (var feature in features.EnumerateArray()) foreach (var feature in features.EnumerateArray())
{ {
@@ -95,6 +278,11 @@ public sealed class MapExportService
var placemark = new XElement(Kml + "Placemark", var placemark = new XElement(Kml + "Placemark",
new XElement(Kml + "name", FeatureName(properties, category)), new XElement(Kml + "name", FeatureName(properties, category)),
new XElement(Kml + "styleUrl", $"#{NormalizeStyleId(category)}")); new XElement(Kml + "styleUrl", $"#{NormalizeStyleId(category)}"));
var featureStyle = BuildFeatureStyle(properties);
if (featureStyle is not null)
{
placemark.Add(featureStyle);
}
var extendedData = BuildExtendedData(properties); var extendedData = BuildExtendedData(properties);
if (extendedData is not null) if (extendedData is not null)
@@ -102,7 +290,31 @@ public sealed class MapExportService
placemark.Add(extendedData); placemark.Add(extendedData);
} }
placemark.Add(BuildGeometry(geometry)); placemark.Add(BuildGeometry(geometry));
document.Add(placemark); var categoryName = GetString(properties, "_lmeCategoryName")?.Trim();
var groupName = GetString(properties, "_lmeGroupName")?.Trim();
var parent = document;
if (!string.IsNullOrWhiteSpace(categoryName))
{
if (!categoryFolders.TryGetValue(categoryName, out var categoryFolder))
{
categoryFolder = new XElement(Kml + "Folder", new XElement(Kml + "name", categoryName));
categoryFolders[categoryName] = categoryFolder;
document.Add(categoryFolder);
}
parent = categoryFolder;
}
if (!string.IsNullOrWhiteSpace(groupName))
{
var key = (categoryName ?? string.Empty, groupName);
if (!groupFolders.TryGetValue(key, out var groupFolder))
{
groupFolder = new XElement(Kml + "Folder", new XElement(Kml + "name", groupName));
groupFolders[key] = groupFolder;
parent.Add(groupFolder);
}
parent = groupFolder;
}
parent.Add(placemark);
} }
return new XDocument(new XDeclaration("1.0", "utf-8", null), new XElement(Kml + "kml", document)).ToString(); return new XDocument(new XDeclaration("1.0", "utf-8", null), new XElement(Kml + "kml", document)).ToString();
@@ -116,6 +328,37 @@ public sealed class MapExportService
new XElement(Kml + "width", 3)), new XElement(Kml + "width", 3)),
new XElement(Kml + "PolyStyle", new XElement(Kml + "color", fillColor))); new XElement(Kml + "PolyStyle", new XElement(Kml + "color", fillColor)));
private static XElement? BuildFeatureStyle(JsonElement properties)
{
var color = GetString(properties, "_lmeColor");
var fillColor = GetString(properties, "_lmeFillColor") ?? color;
if (string.IsNullOrWhiteSpace(color) && string.IsNullOrWhiteSpace(fillColor)) return null;
var weight = GetNumber(properties, "_lmeWeight", 3);
var opacity = GetNumber(properties, "_lmeOpacity", 1);
var fillOpacity = GetNumber(properties, "_lmeFillOpacity", 0.2);
return new XElement(Kml + "Style",
new XElement(Kml + "LineStyle",
new XElement(Kml + "color", ToKmlColor(color ?? "#f97316", opacity)),
new XElement(Kml + "width", weight.ToString("0.##", CultureInfo.InvariantCulture))),
new XElement(Kml + "PolyStyle",
new XElement(Kml + "color", ToKmlColor(fillColor ?? "#fb923c", fillOpacity))));
}
private static double GetNumber(JsonElement properties, string name, double fallback) =>
properties.ValueKind == JsonValueKind.Object
&& properties.TryGetProperty(name, out var value)
&& value.ValueKind == JsonValueKind.Number
? value.GetDouble()
: fallback;
private static string ToKmlColor(string html, double opacity)
{
var value = html.TrimStart('#');
if (value.Length != 6) value = "f97316";
var alpha = (int)Math.Round(Math.Clamp(opacity, 0, 1) * 255);
return $"{alpha:x2}{value[4..6]}{value[2..4]}{value[0..2]}";
}
private static XElement? BuildExtendedData(JsonElement properties) private static XElement? BuildExtendedData(JsonElement properties)
{ {
if (properties.ValueKind != JsonValueKind.Object) if (properties.ValueKind != JsonValueKind.Object)
@@ -185,7 +428,8 @@ public sealed class MapExportService
} }
private static string FeatureName(JsonElement properties, string category) => private static string FeatureName(JsonElement properties, string category) =>
GetString(properties, "name") GetString(properties, "_lmeDisplayName")
?? GetString(properties, "name")
?? GetString(properties, "Name") ?? GetString(properties, "Name")
?? GetString(properties, "LABEL") ?? GetString(properties, "LABEL")
?? GetString(properties, "NATIONALCADASTRALREFERENCE") ?? GetString(properties, "NATIONALCADASTRALREFERENCE")
+1 -1
View File
@@ -13,7 +13,7 @@ public sealed class NetworkLocationService
public NetworkLocationService() public NetworkLocationService()
{ {
httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.20"); httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
} }
public async Task<NetworkLocationSnapshot?> GetApproximateLocationAsync( public async Task<NetworkLocationSnapshot?> GetApproximateLocationAsync(
+1 -1
View File
@@ -44,7 +44,7 @@ public sealed class OfficialCadastreService
["SRSNAME"] = "urn:ogc:def:crs:EPSG::6706", ["SRSNAME"] = "urn:ogc:def:crs:EPSG::6706",
["BBOX"] = bbox, ["BBOX"] = bbox,
["REQUEST"] = "GetFeature", ["REQUEST"] = "GetFeature",
["COUNT"] = "20" ["COUNT"] = "100"
}; };
var url = WfsEndpoint + "?" + string.Join("&", query.Select(item => var url = WfsEndpoint + "?" + string.Join("&", query.Select(item =>
+271 -11
View File
@@ -1,5 +1,6 @@
using System.Text; using System.Text;
using System.Text.Json; using System.Text.Json;
using System.IO.Compression;
namespace LMEMappeCatastaliApp.Services; namespace LMEMappeCatastaliApp.Services;
@@ -13,8 +14,9 @@ public sealed class ProjectStorageService
}; };
private string ProjectsDirectory => Path.Combine(FileSystem.AppDataDirectory, "Projects"); private string ProjectsDirectory => Path.Combine(FileSystem.AppDataDirectory, "Projects");
private string HistoryDirectory => Path.Combine(ProjectsDirectory, ".history");
public async Task<IReadOnlyList<MapProjectSummary>> GetProjectsAsync() public async Task<IReadOnlyList<MapProjectSummary>> GetProjectsAsync(bool includeArchived = true)
{ {
await _gate.WaitAsync(); await _gate.WaitAsync();
try try
@@ -22,6 +24,7 @@ public sealed class ProjectStorageService
var files = await ReadProjectFilesAsync(); var files = await ReadProjectFilesAsync();
return files return files
.Select(item => item.Document.ToSummary()) .Select(item => item.Document.ToSummary())
.Where(item => includeArchived || !item.IsArchived)
.OrderByDescending(item => item.UpdatedAt) .OrderByDescending(item => item.UpdatedAt)
.ThenBy(item => item.Name, StringComparer.CurrentCultureIgnoreCase) .ThenBy(item => item.Name, StringComparer.CurrentCultureIgnoreCase)
.ToArray(); .ToArray();
@@ -56,17 +59,32 @@ public sealed class ProjectStorageService
var now = DateTimeOffset.UtcNow; var now = DateTimeOffset.UtcNow;
var id = existing?.Document.Id ?? Guid.NewGuid().ToString("N"); var id = existing?.Document.Id ?? Guid.NewGuid().ToString("N");
if (existing is not null)
{
Directory.CreateDirectory(HistoryDirectory);
var revisionName = $"{id}--{existing.Document.UpdatedAt:yyyyMMddHHmmssfff}{ProjectExtension}";
File.Copy(existing.Path, Path.Combine(HistoryDirectory, revisionName), true);
PruneHistory(id, 15);
}
var document = new MapProjectDocument var document = new MapProjectDocument
{ {
SchemaVersion = 1, SchemaVersion = 3,
Id = id, Id = id,
Name = normalizedName, Name = normalizedName,
CreatedAt = existing?.Document.CreatedAt ?? now, CreatedAt = existing?.Document.CreatedAt ?? now,
UpdatedAt = now, UpdatedAt = now,
IncludesCadastralParcels = includesCadastralParcels, IncludesCadastralParcels = includesCadastralParcels,
Folder = existing?.Document.Folder ?? string.Empty,
IsArchived = existing?.Document.IsArchived ?? false,
AccessMode = existing?.Document.AccessMode ?? "editable",
Map = snapshotDocument.RootElement.Clone() Map = snapshotDocument.RootElement.Clone()
}; };
if (existing?.Document.AccessMode == "readonly")
{
throw new InvalidOperationException("Il progetto e' in sola lettura. Duplicalo per modificarlo.");
}
var path = existing?.Path ?? Path.Combine(ProjectsDirectory, BuildFileName(normalizedName, id)); var path = existing?.Path ?? Path.Combine(ProjectsDirectory, BuildFileName(normalizedName, id));
var temporaryPath = path + ".tmp"; var temporaryPath = path + ".tmp";
try try
@@ -93,6 +111,194 @@ public sealed class ProjectStorageService
} }
} }
public async Task<MapProjectSummary> DuplicateAsync(string projectId)
{
await _gate.WaitAsync();
try
{
var files = await ReadProjectFilesAsync();
var source = files.FirstOrDefault(item => item.Document.Id == projectId)
?? throw new FileNotFoundException("Il progetto selezionato non esiste piu'.");
var usedNames = files.Select(item => item.Document.Name).ToHashSet(StringComparer.CurrentCultureIgnoreCase);
var baseName = $"{source.Document.Name} - copia";
var name = baseName;
for (var index = 2; usedNames.Contains(name); index++)
{
name = $"{baseName} {index}";
}
var now = DateTimeOffset.UtcNow;
var id = Guid.NewGuid().ToString("N");
var copy = new MapProjectDocument
{
SchemaVersion = 2,
Id = id,
Name = name,
CreatedAt = now,
UpdatedAt = now,
IncludesCadastralParcels = source.Document.IncludesCadastralParcels,
Folder = source.Document.Folder,
AccessMode = "editable",
Map = source.Document.Map.Clone()
};
var path = Path.Combine(ProjectsDirectory, BuildFileName(name, id));
await File.WriteAllTextAsync(path, JsonSerializer.Serialize(copy, _jsonOptions), new UTF8Encoding(false));
return copy.ToSummary();
}
finally { _gate.Release(); }
}
public async Task UpdateOrganizationAsync(string projectId, string? folder = null, bool? isArchived = null)
{
await _gate.WaitAsync();
try
{
var project = (await ReadProjectFilesAsync()).FirstOrDefault(item => item.Document.Id == projectId)
?? throw new FileNotFoundException("Il progetto selezionato non esiste piu'.");
project.Document.Folder = NormalizeFolder(folder ?? project.Document.Folder);
project.Document.IsArchived = isArchived ?? project.Document.IsArchived;
project.Document.UpdatedAt = DateTimeOffset.UtcNow;
await File.WriteAllTextAsync(project.Path, JsonSerializer.Serialize(project.Document, _jsonOptions), new UTF8Encoding(false));
}
finally { _gate.Release(); }
}
public async Task<IReadOnlyList<MapProjectVersion>> GetVersionsAsync(string projectId)
{
await _gate.WaitAsync();
try
{
Directory.CreateDirectory(HistoryDirectory);
var versions = new List<MapProjectVersion>();
foreach (var path in Directory.EnumerateFiles(HistoryDirectory, $"{projectId}--*{ProjectExtension}"))
{
try
{
await using var stream = File.OpenRead(path);
var document = await JsonSerializer.DeserializeAsync<MapProjectDocument>(stream, _jsonOptions);
if (document is not null)
{
versions.Add(new(Path.GetFileName(path), document.UpdatedAt));
}
}
catch (JsonException) { }
catch (IOException) { }
}
return versions.OrderByDescending(item => item.UpdatedAt).ToArray();
}
finally { _gate.Release(); }
}
public async Task<string> LoadVersionAsync(string projectId, string versionId)
{
await _gate.WaitAsync();
try
{
if (!versionId.StartsWith($"{projectId}--", StringComparison.Ordinal)
|| Path.GetFileName(versionId) != versionId)
{
throw new InvalidDataException("Revisione non valida.");
}
var path = Path.Combine(HistoryDirectory, versionId);
await using var stream = File.OpenRead(path);
var document = await JsonSerializer.DeserializeAsync<MapProjectDocument>(stream, _jsonOptions)
?? throw new InvalidDataException("Revisione non leggibile.");
return document.Map.GetRawText();
}
finally { _gate.Release(); }
}
public async Task<string> CreateBackupAsync()
{
await _gate.WaitAsync();
try
{
Directory.CreateDirectory(ProjectsDirectory);
var directory = Path.Combine(FileSystem.CacheDirectory, "Backups");
Directory.CreateDirectory(directory);
var path = Path.Combine(directory, $"LMEMappeCatastali-backup-{DateTime.Now:yyyyMMdd-HHmmss}.lmebackup.zip");
if (File.Exists(path)) File.Delete(path);
ZipFile.CreateFromDirectory(ProjectsDirectory, path, CompressionLevel.Optimal, false);
return path;
}
finally { _gate.Release(); }
}
public async Task<int> RestoreBackupAsync(string backupPath)
{
await _gate.WaitAsync();
try
{
Directory.CreateDirectory(ProjectsDirectory);
using var archive = ZipFile.OpenRead(backupPath);
var restored = 0;
foreach (var entry in archive.Entries.Where(item => item.FullName.EndsWith(ProjectExtension, StringComparison.OrdinalIgnoreCase)))
{
var fileName = Path.GetFileName(entry.FullName);
if (string.IsNullOrWhiteSpace(fileName)) continue;
var targetDirectory = entry.FullName.Contains(".history/", StringComparison.OrdinalIgnoreCase)
|| entry.FullName.Contains(".history\\", StringComparison.OrdinalIgnoreCase)
? HistoryDirectory : ProjectsDirectory;
Directory.CreateDirectory(targetDirectory);
entry.ExtractToFile(Path.Combine(targetDirectory, fileName), true);
if (targetDirectory == ProjectsDirectory) restored++;
}
return restored;
}
finally { _gate.Release(); }
}
public async Task<string> CreateProjectPackageAsync(string projectId, bool readOnly = false)
{
await _gate.WaitAsync();
try
{
var project = (await ReadProjectFilesAsync()).FirstOrDefault(item => item.Document.Id == projectId)
?? throw new FileNotFoundException("Il progetto selezionato non esiste piu'.");
var directory = Path.Combine(FileSystem.CacheDirectory, "Projects");
Directory.CreateDirectory(directory);
var mode = readOnly ? "readonly" : "editable";
var path = Path.Combine(directory, $"{Path.GetFileNameWithoutExtension(project.Path)}-{mode}{ProjectExtension}");
var package = new MapProjectDocument
{
SchemaVersion = 3,
Id = project.Document.Id,
Name = project.Document.Name,
CreatedAt = project.Document.CreatedAt,
UpdatedAt = project.Document.UpdatedAt,
IncludesCadastralParcels = project.Document.IncludesCadastralParcels,
Folder = project.Document.Folder,
IsArchived = false,
AccessMode = mode,
Map = project.Document.Map.Clone()
};
await File.WriteAllTextAsync(path, JsonSerializer.Serialize(package, _jsonOptions), new UTF8Encoding(false));
return path;
}
finally { _gate.Release(); }
}
public async Task<MapProjectSummary> ImportProjectAsync(string path)
{
await _gate.WaitAsync();
try
{
await using var stream = File.OpenRead(path);
var source = await JsonSerializer.DeserializeAsync<MapProjectDocument>(stream, _jsonOptions)
?? throw new InvalidDataException("Progetto non leggibile.");
if (source.Map.ValueKind != JsonValueKind.Object) throw new InvalidDataException("Mappa del progetto non valida.");
source.Id = Guid.NewGuid().ToString("N");
source.Name = NormalizeName(source.Name);
source.CreatedAt = source.UpdatedAt = DateTimeOffset.UtcNow;
source.IsArchived = false;
source.AccessMode = source.AccessMode == "readonly" ? "readonly" : "editable";
Directory.CreateDirectory(ProjectsDirectory);
var target = Path.Combine(ProjectsDirectory, BuildFileName(source.Name, source.Id));
await File.WriteAllTextAsync(target, JsonSerializer.Serialize(source, _jsonOptions), new UTF8Encoding(false));
return source.ToSummary();
}
finally { _gate.Release(); }
}
public async Task<string> LoadAsync(string projectId) public async Task<string> LoadAsync(string projectId)
{ {
await _gate.WaitAsync(); await _gate.WaitAsync();
@@ -118,6 +324,13 @@ public sealed class ProjectStorageService
.FirstOrDefault(item => item.Document.Id == projectId) .FirstOrDefault(item => item.Document.Id == projectId)
?? throw new FileNotFoundException("Il progetto selezionato non esiste piu'."); ?? throw new FileNotFoundException("Il progetto selezionato non esiste piu'.");
File.Delete(project.Path); File.Delete(project.Path);
if (Directory.Exists(HistoryDirectory))
{
foreach (var path in Directory.EnumerateFiles(HistoryDirectory, $"{projectId}--*{ProjectExtension}"))
{
File.Delete(path);
}
}
} }
finally finally
{ {
@@ -125,6 +338,30 @@ public sealed class ProjectStorageService
} }
} }
public async Task<string> CreateScheduledBackupAsync(int keep = 10)
{
var source = await CreateBackupAsync();
var directory = Path.Combine(FileSystem.AppDataDirectory, "AutomaticBackups");
Directory.CreateDirectory(directory);
var target = Path.Combine(directory, $"LME-auto-{DateTime.Now:yyyyMMdd-HHmmss}.lmebackup.zip");
File.Copy(source, target, true);
foreach (var stale in Directory.EnumerateFiles(directory, "*.lmebackup.zip")
.OrderByDescending(File.GetLastWriteTimeUtc).Skip(Math.Clamp(keep, 2, 30)))
{
File.Delete(stale);
}
return target;
}
public DateTimeOffset? GetLatestScheduledBackupTime()
{
var directory = Path.Combine(FileSystem.AppDataDirectory, "AutomaticBackups");
if (!Directory.Exists(directory)) return null;
var latest = Directory.EnumerateFiles(directory, "*.lmebackup.zip")
.OrderByDescending(File.GetLastWriteTimeUtc).FirstOrDefault();
return latest is null ? null : File.GetLastWriteTimeUtc(latest);
}
private async Task<IReadOnlyList<ProjectFileEntry>> ReadProjectFilesAsync() private async Task<IReadOnlyList<ProjectFileEntry>> ReadProjectFilesAsync()
{ {
Directory.CreateDirectory(ProjectsDirectory); Directory.CreateDirectory(ProjectsDirectory);
@@ -179,19 +416,37 @@ public sealed class ProjectStorageService
return $"{safeName}--{id[..8]}{ProjectExtension}"; return $"{safeName}--{id[..8]}{ProjectExtension}";
} }
private void PruneHistory(string projectId, int keep)
{
foreach (var path in Directory.EnumerateFiles(HistoryDirectory, $"{projectId}--*{ProjectExtension}")
.OrderByDescending(File.GetLastWriteTimeUtc).Skip(keep))
{
File.Delete(path);
}
}
private static string NormalizeFolder(string value)
{
var normalized = string.Join(' ', (value ?? string.Empty).Split([' ', '\t', '\r', '\n'], StringSplitOptions.RemoveEmptyEntries));
return normalized[..Math.Min(normalized.Length, 60)];
}
private sealed record ProjectFileEntry(string Path, MapProjectDocument Document); private sealed record ProjectFileEntry(string Path, MapProjectDocument Document);
private sealed class MapProjectDocument private sealed class MapProjectDocument
{ {
public int SchemaVersion { get; init; } public int SchemaVersion { get; set; }
public string Id { get; init; } = string.Empty; public string Id { get; set; } = string.Empty;
public string Name { get; init; } = string.Empty; public string Name { get; set; } = string.Empty;
public DateTimeOffset CreatedAt { get; init; } public DateTimeOffset CreatedAt { get; set; }
public DateTimeOffset UpdatedAt { get; init; } public DateTimeOffset UpdatedAt { get; set; }
public bool IncludesCadastralParcels { get; init; } public bool IncludesCadastralParcels { get; set; }
public JsonElement Map { get; init; } public string Folder { get; set; } = string.Empty;
public bool IsArchived { get; set; }
public string AccessMode { get; set; } = "editable";
public JsonElement Map { get; set; }
public MapProjectSummary ToSummary() => new(Id, Name, UpdatedAt, IncludesCadastralParcels); public MapProjectSummary ToSummary() => new(Id, Name, UpdatedAt, IncludesCadastralParcels, Folder, IsArchived, AccessMode == "readonly");
} }
} }
@@ -199,4 +454,9 @@ public sealed record MapProjectSummary(
string Id, string Id,
string Name, string Name,
DateTimeOffset UpdatedAt, DateTimeOffset UpdatedAt,
bool IncludesCadastralParcels); bool IncludesCadastralParcels,
string Folder,
bool IsArchived,
bool IsReadOnly);
public sealed record MapProjectVersion(string Id, DateTimeOffset UpdatedAt);
+796 -17
View File
@@ -7,7 +7,7 @@
--accent: #14705e; --accent: #14705e;
--accent-strong: #0c5749; --accent-strong: #0c5749;
--warning: #a34b08; --warning: #a34b08;
--nav-height: 64px; --nav-height: 0px;
} }
html, html,
@@ -135,6 +135,71 @@ input[type="checkbox"] {
flex: 0 0 auto; flex: 0 0 auto;
} }
.map-icon-command,
.map-menu-button {
width: 38px;
min-width: 38px;
min-height: 38px;
padding: 0;
background: #fff;
color: var(--ink);
font-size: 22px;
line-height: 1;
}
.map-menu-button.is-active {
background: #ccebe3;
color: var(--accent-strong);
}
.app-status-line i {
display: inline-block;
width: 8px;
height: 8px;
margin-left: 5px;
border-radius: 50%;
background: #fbbf24;
}
.map-navigation-menu {
position: absolute;
top: 70px;
right: 12px;
left: auto;
z-index: 1150;
display: grid;
width: min(300px, calc(100vw - 24px));
max-height: calc(100vh - 84px);
overflow-y: auto;
border: 1px solid var(--line);
border-radius: 8px;
padding: 7px;
background: rgba(255, 255, 255, 0.99);
box-shadow: 0 5px 22px rgba(0, 0, 0, 0.3);
}
.map-navigation-menu > button {
min-height: 40px;
border-bottom: 1px solid #e5eaed;
border-radius: 0;
background: transparent;
color: var(--ink);
text-align: left;
}
.menu-credits {
display: grid;
gap: 3px;
padding: 10px 12px 5px;
color: var(--muted);
font-size: 10px;
line-height: 1.35;
}
.menu-credits a {
color: var(--accent-strong);
}
.layer-button.is-active { .layer-button.is-active {
background: #ccebe3; background: #ccebe3;
color: var(--accent-strong); color: var(--accent-strong);
@@ -176,10 +241,12 @@ input[type="checkbox"] {
position: absolute; position: absolute;
top: 72px; top: 72px;
right: 12px; right: 12px;
z-index: 940; left: auto;
bottom: calc(var(--nav-height) + 8px);
z-index: 1080;
display: grid; display: grid;
width: min(320px, calc(100% - 24px)); box-sizing: border-box;
max-height: calc(100% - 152px); width: min(480px, 50vw);
overflow-y: auto; overflow-y: auto;
border: 1px solid var(--line); border: 1px solid var(--line);
border-radius: 8px; border-radius: 8px;
@@ -239,6 +306,73 @@ input[type="checkbox"] {
padding-top: 9px; padding-top: 9px;
} }
.menu-help {
margin-top: 4px;
border: 1px solid #c8d3d8;
border-radius: 6px;
background: #f7fafb;
color: var(--ink);
}
.menu-help summary {
display: flex;
align-items: center;
gap: 8px;
min-height: 40px;
padding: 7px 10px;
cursor: pointer;
list-style: none;
font-size: 12px;
}
.menu-help summary::-webkit-details-marker {
display: none;
}
.menu-help summary > span {
display: grid;
place-items: center;
width: 22px;
height: 22px;
border: 1px solid #82949d;
border-radius: 50%;
color: #42535c;
font-weight: 900;
}
.menu-help summary::after {
margin-left: auto;
content: "\25BE";
color: #52636b;
font-size: 14px;
transition: transform 140ms ease;
}
.menu-help[open] summary::after {
transform: rotate(180deg);
}
.menu-help-content {
padding: 10px 12px 12px;
border-top: 1px solid #d8e0e4;
font-size: 11px;
line-height: 1.45;
}
.menu-help-content p {
margin: 0 0 8px;
font-weight: 700;
}
.menu-help-content ol {
margin: 0;
padding-left: 18px;
}
.menu-help-content li + li {
margin-top: 6px;
}
.layer-tree-section { .layer-tree-section {
display: grid; display: grid;
gap: 6px; gap: 6px;
@@ -262,20 +396,234 @@ input[type="checkbox"] {
gap: 4px; gap: 4px;
} }
.layer-selection-toolbar {
position: sticky;
top: -9px;
z-index: 3;
display: grid;
gap: 6px;
padding: 8px 4px;
border-bottom: 1px solid var(--line);
background: rgba(255, 255, 255, 0.98);
}
.layer-selection-toolbar label,
.layer-object-tools > label:not(.layer-manager-suboption),
.layer-style-controls label {
display: grid;
gap: 3px;
font-size: 9px;
}
.layer-selection-summary {
display: flex;
align-items: center;
justify-content: space-between;
gap: 6px;
font-size: 10px;
}
.layer-selection-summary button,
.layer-batch-actions button,
.layer-compact-actions button,
.layer-object-tools > button {
min-height: 28px;
min-width: 0;
padding: 4px 6px;
font-size: 9px;
}
.layer-selection-summary button {
max-width: 48%;
}
.layer-batch-actions,
.layer-compact-actions {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 4px;
}
.layer-group-tools,
.layer-object-tools {
display: grid;
gap: 6px;
min-width: 0;
padding: 7px;
border: 1px dashed var(--layer-group-border, #cbd5da);
border-radius: 4px;
background: rgba(255, 255, 255, 0.7);
}
.layer-group-tools {
margin: 0 3px 4px;
}
.layer-group-totals {
color: var(--muted);
font-size: 9px;
}
.layer-style-controls {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 5px;
}
.layer-style-controls input,
.layer-style-controls select,
.layer-object-tools textarea {
width: 100%;
min-width: 0;
min-height: 28px;
padding: 3px;
font-size: 10px;
}
.layer-style-controls input[type="color"] {
padding: 1px;
}
.layer-color-editor {
grid-column: 1 / -1;
display: grid;
gap: 5px;
padding: 6px;
border: 1px solid #cbd5da;
border-radius: 4px;
background: rgba(255, 255, 255, 0.82);
}
.layer-color-editor > header {
display: grid;
grid-template-columns: minmax(0, 1fr) 46px auto;
align-items: center;
gap: 5px;
font-size: 10px;
}
.layer-color-editor > header input[type="color"] {
width: 46px;
min-height: 30px;
}
.layer-color-editor button {
min-height: 28px;
min-width: 0;
padding: 3px 6px;
font-size: 9px;
}
.layer-color-formats {
display: grid;
gap: 4px;
}
.layer-color-formats label {
grid-template-columns: 30px minmax(0, 1fr);
align-items: center;
}
.layer-color-formats input {
font-family: Consolas, "Courier New", monospace;
}
.layer-color-copy {
justify-self: stretch;
}
.layer-photo-picker {
position: relative;
min-height: 32px;
place-items: center;
border: 1px dashed #8aa2aa;
border-radius: 4px;
}
.layer-photo-picker input {
position: absolute;
inset: 0;
opacity: 0;
}
.layer-photo-preview {
display: block;
width: 100%;
max-height: 140px;
object-fit: contain;
}
.lme-popup-photo {
display: block;
width: min(240px, 60vw);
max-height: 180px;
margin-top: 6px;
object-fit: contain;
}
.lme-permanent-label {
width: 0 !important;
height: 0 !important;
border: 0 !important;
background: transparent !important;
}
.lme-permanent-label span {
position: absolute;
transform: translate(-50%, -50%);
padding: 2px 5px;
border: 1px solid #52616c;
border-radius: 3px;
background: rgba(255, 255, 255, 0.92);
color: #17212b;
font-size: 10px;
font-weight: 800;
white-space: nowrap;
}
.lme-offline-tile {
box-sizing: border-box;
width: 256px;
height: 256px;
border: 1px solid #d8e0e3;
background-color: #f5f7f8;
}
.layer-manager-group, .layer-manager-group,
.layer-manager-block, .layer-manager-block,
.layer-manager-object { .layer-manager-object {
border: 1px solid #dce3e6; border: 1px solid var(--layer-group-border, #dce3e6);
border-radius: 6px; border-radius: 6px;
background: #fff; background: var(--layer-group-surface, #fff);
}
.layer-manager-group > summary {
background: var(--layer-group-parent, #f6f8f9);
}
.layer-manager-block > summary {
background: color-mix(in srgb, var(--layer-group-parent, #f6f8f9) 72%, white);
}
.layer-manager-object > summary {
background: color-mix(in srgb, var(--layer-group-parent, #f6f8f9) 42%, white);
}
.layer-manager-details,
.layer-group-tools {
background: color-mix(in srgb, var(--layer-group-parent, #f6f8f9) 22%, white);
} }
.layer-manager-group > summary, .layer-manager-group > summary,
.layer-manager-block > summary, .layer-manager-block > summary,
.layer-manager-object > summary { .layer-manager-object > summary {
display: grid; display: grid;
grid-template-columns: 28px 20px minmax(0, 1fr) auto auto; grid-template-columns: 28px 28px minmax(0, 1fr) 50px;
align-items: center; grid-template-areas:
"handle expand title count"
". . visibility moves"
"actions actions actions actions";
align-items: start;
gap: 6px; gap: 6px;
min-height: 38px; min-height: 38px;
padding: 4px 6px; padding: 4px 6px;
@@ -283,6 +631,24 @@ input[type="checkbox"] {
list-style: none; list-style: none;
} }
.layer-expand-button {
grid-area: expand;
grid-row: 1 / span 3;
align-self: center;
justify-self: center;
width: 28px;
min-width: 28px;
height: 28px;
min-height: 28px;
padding: 0;
border: 1px solid #cbd5da;
border-radius: 4px;
background: #fff;
color: var(--ink);
font-size: 18px;
line-height: 1;
}
.layer-manager-group > summary::-webkit-details-marker, .layer-manager-group > summary::-webkit-details-marker,
.layer-manager-block > summary::-webkit-details-marker, .layer-manager-block > summary::-webkit-details-marker,
.layer-manager-object > summary::-webkit-details-marker { .layer-manager-object > summary::-webkit-details-marker {
@@ -290,6 +656,7 @@ input[type="checkbox"] {
} }
.layer-drag-handle { .layer-drag-handle {
grid-area: handle;
width: 28px; width: 28px;
height: 28px; height: 28px;
border: 0; border: 0;
@@ -302,7 +669,68 @@ input[type="checkbox"] {
cursor: grab; cursor: grab;
} }
.layer-row-actions {
grid-area: actions;
display: grid;
grid-template-columns: minmax(0, 1fr);
width: 100%;
gap: 4px;
margin-top: 2px;
}
.layer-manager-group > summary > input,
.layer-manager-block > summary > input,
.layer-manager-object > summary > input {
grid-area: visibility;
justify-self: start;
width: 20px;
height: 20px;
margin: 1px 0;
}
.layer-rename-button,
.layer-membership-button,
.layer-remove-button {
width: 100%;
min-height: 28px;
min-width: 0;
padding: 4px;
border: 1px solid #bfd4cd;
border-radius: 4px;
background: #eef8f5;
color: var(--accent-strong);
font-size: 10px;
font-weight: 800;
line-height: 1.15;
overflow-wrap: anywhere;
}
.layer-rename-button:active {
background: #d9eee7;
}
.layer-membership-button {
border-color: #bfdbfe;
background: #eff6ff;
color: #1d4ed8;
}
.layer-membership-button:active {
background: #dbeafe;
}
.layer-remove-button {
border-color: #fecaca;
background: #fff1f2;
color: #b42318;
}
.layer-remove-button:active {
background: #ffe4e6;
}
.layer-move-buttons { .layer-move-buttons {
grid-area: moves;
display: inline-grid; display: inline-grid;
grid-template-columns: 24px 24px; grid-template-columns: 24px 24px;
gap: 2px; gap: 2px;
@@ -326,29 +754,242 @@ input[type="checkbox"] {
} }
.layer-manager-title { .layer-manager-title {
grid-area: title;
min-width: 0; min-width: 0;
overflow-wrap: anywhere; overflow-wrap: anywhere;
color: var(--layer-group-accent, var(--ink));
font-size: 12px; font-size: 12px;
font-weight: 700; }
.layer-manager-group > summary > .layer-manager-title {
font-size: 13px;
font-weight: 800;
}
.layer-manager-block > summary > .layer-manager-title {
font-size: 12px;
font-weight: 800;
}
.layer-manager-object > summary > .layer-manager-title {
font-size: 11px;
font-style: italic;
font-weight: 400;
}
.layer-inline-lock {
grid-area: visibility;
justify-self: center;
width: 28px;
min-width: 28px;
min-height: 24px;
margin-left: 26px;
padding: 0;
background: transparent;
color: var(--ink);
font-size: 15px;
}
.layer-inline-lock.is-locked {
background: #fff2cc;
}
.project-readonly .leaflet-draw,
.project-readonly .layer-rename-button,
.project-readonly .layer-membership-button,
.project-readonly .layer-remove-button,
.project-readonly .layer-inline-lock,
.project-readonly .layer-object-tools,
.project-readonly .layer-group-tools,
.project-readonly .layer-batch-actions {
pointer-events: none;
opacity: 0.5;
}
.lme-app-dialog {
position: absolute;
inset: 0;
z-index: 1500;
display: grid;
place-items: center;
padding: 16px;
background: rgba(15, 23, 28, 0.48);
}
.lme-app-dialog > section {
display: flex;
flex-direction: column;
width: min(820px, 96vw);
max-height: 88vh;
overflow: hidden;
border-radius: 8px;
background: #fff;
box-shadow: 0 8px 30px rgba(0, 0, 0, 0.32);
}
.lme-app-dialog header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 10px 12px;
border-bottom: 1px solid var(--line);
}
.lme-app-dialog header button {
width: 36px;
min-width: 36px;
min-height: 34px;
padding: 0;
background: #e9eef0;
color: var(--ink);
font-size: 22px;
}
.lme-app-dialog-body {
overflow: auto;
padding: 12px;
}
.object-table-wrap {
overflow: auto;
}
.object-table-wrap table {
width: 100%;
border-collapse: collapse;
font-size: 12px;
}
.object-table-wrap th,
.object-table-wrap td {
padding: 7px;
border-bottom: 1px solid var(--line);
text-align: left;
white-space: nowrap;
}
.object-table-wrap button {
width: 30px;
min-width: 30px;
min-height: 30px;
padding: 0;
}
.object-table-search,
.coordinate-result {
display: grid;
gap: 8px;
margin-bottom: 10px;
}
.release-notes {
max-height: 220px;
overflow: auto;
margin: 8px 0 0;
padding: 9px;
border: 1px solid var(--line);
border-radius: 6px;
background: #fff;
color: var(--ink);
font-family: inherit;
font-size: 11px;
white-space: pre-wrap;
}
.lme-offline-image-tile {
width: 256px;
height: 256px;
} }
.layer-manager-count { .layer-manager-count {
grid-area: count;
justify-self: end;
color: var(--muted); color: var(--muted);
font-size: 10px; font-size: 10px;
font-weight: 900;
} }
.layer-manager-children { .layer-manager-children {
padding: 0 5px 5px 18px; margin-left: 4px;
padding: 4px 3px 5px 6px;
border-left: 2px solid var(--layer-group-border, #dce3e6);
}
.layer-manager-block > .layer-manager-children {
margin-left: 5px;
padding-left: 5px;
}
.layer-manager-object {
margin-left: 3px;
border-radius: 4px;
}
.layer-manager-object > summary {
grid-template-columns: 24px 24px minmax(0, 1fr) 46px;
gap: 4px;
padding: 3px 4px;
}
.layer-manager-object > summary > .layer-expand-button {
width: 24px;
min-width: 24px;
height: 24px;
min-height: 24px;
font-size: 15px;
}
.layer-manager-object > summary > .layer-drag-handle {
width: 24px;
height: 24px;
font-size: 15px;
}
.layer-manager-object > summary > .layer-move-buttons {
grid-template-columns: 22px 22px;
}
.layer-manager-object > summary > .layer-move-buttons button {
width: 22px;
height: 24px;
}
.layer-manager-object > summary .layer-rename-button,
.layer-manager-object > summary .layer-membership-button,
.layer-manager-object > summary .layer-remove-button {
min-height: 24px;
font-size: 9px;
} }
.layer-manager-details { .layer-manager-details {
display: grid; display: grid;
gap: 2px; gap: 2px;
padding: 0 8px 7px 40px; padding: 0 6px 7px 12px;
color: var(--muted); color: var(--muted);
font-size: 10px; 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 { .layer-manager-dragging {
opacity: 0.55; opacity: 0.55;
outline: 2px solid #2563eb; outline: 2px solid #2563eb;
@@ -359,6 +1000,117 @@ input[type="checkbox"] {
box-shadow: inset 3px 0 #ff00d4; box-shadow: inset 3px 0 #ff00d4;
} }
.layer-manager-parent-highlighted > summary,
.layer-manager-parent-selected > summary {
background: #fff0fb;
box-shadow: inset 3px 0 #ff00d4;
}
.layer-manager-selection-path > summary {
box-shadow: inset 3px 0 #ff00d4;
}
.project-command-stack {
display: grid;
gap: 8px;
min-width: 0;
}
.project-command-stack > * {
width: 100%;
min-width: 0;
}
.lme-edit-form,
.attribute-editor,
.attribute-editor-rows {
display: grid;
gap: 12px;
}
.lme-edit-form textarea,
.attribute-editor textarea {
min-height: 82px;
resize: vertical;
white-space: pre-wrap;
}
.dialog-command-row {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 8px;
}
.attribute-editor > p {
margin: 0;
color: var(--muted);
font-size: 12px;
}
.attribute-editor-row {
display: grid;
grid-template-columns: minmax(130px, 0.8fr) minmax(180px, 2fr) 36px;
align-items: end;
gap: 8px;
padding-bottom: 10px;
border-bottom: 1px solid var(--line);
}
.attribute-editor-row > button {
width: 36px;
min-width: 36px;
min-height: 36px;
padding: 0;
background: #fff1f2;
color: #b42318;
font-size: 20px;
}
.object-table-legend {
display: flex;
flex-wrap: wrap;
gap: 6px 14px;
margin-bottom: 8px;
color: var(--muted);
font-size: 11px;
}
.object-table-wrap input[type="checkbox"] {
width: 18px;
height: 18px;
}
.geometry-result {
display: grid;
grid-template-columns: 46px minmax(0, 1fr);
align-items: center;
gap: 12px;
}
.geometry-result > span {
display: grid;
place-items: center;
width: 42px;
height: 42px;
border-radius: 50%;
background: #dcfce7;
color: #166534;
font-size: 25px;
font-weight: 900;
}
.geometry-result-warning > span { background: #fef3c7; color: #92400e; }
.geometry-result-error > span { background: #ffe4e6; color: #b42318; }
.geometry-result > p { margin: 0; line-height: 1.45; }
.lme-geometry-toolbar a {
display: grid !important;
place-items: center;
font-size: 20px !important;
font-weight: 900;
text-decoration: none;
}
.gps-overlay { .gps-overlay {
position: absolute; position: absolute;
top: 72px; top: 72px;
@@ -426,18 +1178,24 @@ input[type="checkbox"] {
height: 38px; height: 38px;
} }
.lme-drawing-scope-actions a[aria-disabled="true"] {
opacity: 0.45;
pointer-events: none;
}
.tool-sheet { .tool-sheet {
position: absolute; position: absolute;
top: 0; top: 0;
bottom: var(--nav-height); bottom: var(--nav-height);
left: 0; right: 0;
left: auto;
z-index: 1100; z-index: 1100;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: min(430px, calc(100% - 48px)); width: min(430px, calc(100% - 48px));
border-right: 1px solid var(--line); border-left: 1px solid var(--line);
background: var(--panel); background: var(--panel);
box-shadow: 7px 0 24px rgba(0, 0, 0, 0.24); box-shadow: -7px 0 24px rgba(0, 0, 0, 0.24);
} }
.sheet-header { .sheet-header {
@@ -868,8 +1626,15 @@ footer {
.map-layer-panel { .map-layer-panel {
top: 68px; top: 68px;
right: 8px; right: 8px;
width: min(320px, calc(100% - 16px)); left: auto;
max-height: calc(100% - 144px); bottom: calc(var(--nav-height) + 8px);
width: 50vw;
}
.map-navigation-menu {
top: 66px;
right: 8px;
left: auto;
} }
.tool-sheet { .tool-sheet {
@@ -877,11 +1642,25 @@ footer {
bottom: var(--nav-height); bottom: var(--nav-height);
width: 100%; width: 100%;
border-top: 1px solid var(--line); border-top: 1px solid var(--line);
border-right: 0; border-left: 0;
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
box-shadow: 0 -7px 24px rgba(0, 0, 0, 0.24); box-shadow: 0 -7px 24px rgba(0, 0, 0, 0.24);
} }
.attribute-editor-row {
grid-template-columns: minmax(0, 1fr) 36px;
}
.attribute-editor-row > label {
grid-column: 1;
}
.attribute-editor-row > button {
grid-column: 2;
grid-row: 1 / span 2;
align-self: center;
}
.gps-overlay { .gps-overlay {
top: 68px; top: 68px;
right: 8px; right: 8px;
+1
View File
@@ -31,6 +31,7 @@
<script src="lib/googlemutant/Leaflet.GoogleMutant.js"></script> <script src="lib/googlemutant/Leaflet.GoogleMutant.js"></script>
<script src="lib/jszip/jszip.min.js"></script> <script src="lib/jszip/jszip.min.js"></script>
<script src="lib/togeojson/togeojson.umd.js"></script> <script src="lib/togeojson/togeojson.umd.js"></script>
<script src="lib/turf/turf.min.js"></script>
<script src="js/lme-map.js"></script> <script src="js/lme-map.js"></script>
</body> </body>
+2578 -100
View File
File diff suppressed because it is too large. Load diff
+37
View File
@@ -0,0 +1,37 @@
!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).turf={})}(this,(function(t){"use strict";function e(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=Array(e);n<e;n++)r[n]=t[n];return r}function n(t){if(Array.isArray(t))return t}function r(t,e,n){return e=l(e),function(t,e){if(e&&("object"==typeof e||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(t,c()?Reflect.construct(e,n||[],l(t).constructor):e.apply(t,n))}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,y(r.key),r)}}function s(t,e,n){return e&&o(t.prototype,e),n&&o(t,n),Object.defineProperty(t,"prototype",{writable:!1}),t}function a(t,e){var n="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(!n){if(Array.isArray(t)||(n=_(t))||e){n&&(t=n);var r=0,i=function(){};return{s:i,n:function(){return r>=t.length?{done:!0}:{done:!1,value:t[r++]}},e:function(t){throw t},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,s=!0,a=!1;return{s:function(){n=n.call(t)},n:function(){var t=n.next();return s=t.done,t},e:function(t){a=!0,o=t},f:function(){try{s||null==n.return||n.return()}finally{if(a)throw o}}}}function u(t,e,n){return(e=y(e))in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function l(t){return l=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},l(t)}function h(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&p(t,e)}function c(){try{var t=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){})))}catch(t){}return(c=function(){return!!t})()}function f(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}function g(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function p(t,e){return p=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},p(t,e)}function v(t,e){return n(t)||function(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=n){var r,i,o,s,a=[],u=!0,l=!1;try{if(o=(n=n.call(t)).next,0===e){if(Object(n)!==n)return;u=!1}else for(;!(u=(r=o.call(n)).done)&&(a.push(r.value),a.length!==e);u=!0);}catch(t){l=!0,i=t}finally{try{if(!u&&null!=n.return&&(s=n.return(),Object(s)!==s))return}finally{if(l)throw i}}return a}}(t,e)||_(t,e)||g()}function d(t){return function(t){if(Array.isArray(t))return e(t)}(t)||f(t)||_(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function y(t){var e=function(t,e){if("object"!=typeof t||!t)return t;var n=t[Symbol.toPrimitive];if(void 0!==n){var r=n.call(t,e||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===e?String:Number)(t)}(t,"string");return"symbol"==typeof e?e:e+""}function m(t){return m="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},m(t)}function _(t,n){if(t){if("string"==typeof t)return e(t,n);var r={}.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?e(t,n):void 0}}var x=6371008.8,E={centimeters:100*x,centimetres:100*x,degrees:360/(2*Math.PI),feet:3.28084*x,inches:39.37*x,kilometers:x/1e3,kilometres:x/1e3,meters:x,metres:x,miles:x/1609.344,millimeters:1e3*x,millimetres:1e3*x,nauticalmiles:x/1852,radians:1,yards:1.0936*x},k={acres:247105e-9,centimeters:1e4,centimetres:1e4,feet:10.763910417,hectares:1e-4,inches:1550.003100006,kilometers:1e-6,kilometres:1e-6,meters:1,metres:1,miles:386e-9,nauticalmiles:2.9155334959812285e-7,millimeters:1e6,millimetres:1e6,yards:1.195990046};function b(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r={type:"Feature"};return(0===Line truncated
/*!
* Copyright (c) 2019, Dane Springmeyer
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
function ta(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=[];if(mt(t,(function(t){n.push(t.coordinates)})),n.length<2)throw new Error("Must specify at least 2 geometries");var r=Rs.apply(Fs,[n[0]].concat(d(n.slice(1))));return 0===r.length?null:1===r.length?S(r[0],e.properties):R(r,e.properties)}function ea(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=JSON.stringify(n.properties||{}),i=v(t,4),o=i[0],s=i[1],a=i[2],u=i[3],l=(s+u)/2,h=(o+a)/2,c=2*e/ut([o,l],[a,l],n)*(a-o),f=2*e/ut([h,s],[h,u],n)*(u-s),g=c/2,p=2*g,d=Math.sqrt(3)/2*f,y=a-o,m=u-s,_=3/4*p,x=d,E=(y-p)/(p-g/2),k=Math.floor(E),b=(k*_-g/2-y)/2-g/2+_/2,w=Math.floor((m-d)/d),I=(m-w*d)/2,N=w*d-m>d/2;N&&(I-=d/4);for(var S=[],M=[],L=0;L<6;L++){var P=2*Math.PI/6*L;S.push(Math.cos(P)),M.push(Math.sin(P))}for(var T=[],O=0;O<=k;O++)for(var R=0;R<=w;R++){var A=O%2==1;if((0!==R||!A)&&(0!==R||!N)){var D=O*_+o-b,F=R*x+s+I;if(A&&(F-=d/2),!0===n.triangles)ra([D,F],c/2,f/2,JSON.parse(r),S,M).forEach((function(t){n.mask?ta(C([n.mask,t]))&&T.push(t):T.push(t)}));else{var q=na([D,F],c/2,f/2,JSON.parse(r),S,M);n.mask?ta(C([n.mask,q]))&&T.push(q):T.push(q)}}}return C(T)}function na(t,e,n,r,i,o){for(var s=[],a=0;a<6;a++){var u=t[0]+e*i[a],l=t[1]+n*o[a];s.push([u,l])}return s.push(s[0].slice()),S([s],r)}function ra(t,e,n,r,i,o){for(var s=[],a=0;a<6;a++){var u=[];u.push(t),u.push([t[0]+e*i[a],t[1]+n*o[a]]),u.push([t[0]+e*i[(a+1)%6],t[1]+n*o[(a+1)%6]]),u.push(t),s.push(S([u],r))}return s}function ia(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};n.mask&&!n.units&&(n.units="kilometers");for(var r=[],i=t[0],o=t[1],s=t[2],a=t[3],u=e/ut([i,o],[s,o],n)*(s-i),l=e/ut([i,o],[i,a],n)*(a-o),h=s-i,c=a-o,f=Math.floor(h/u),g=(c-Math.floor(c/l)*l)/2,p=i+(h-f*u)/2;p<=s;){for(var v=o+g;v<=a;){var d=I([p,v],n.properties);n.mask?Cn(d,n.mask)&&r.push(d):r.push(d),v+=l}p+=u}return C(r)}function oa(t,e,n){for(var r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},i=[],o=t[0],s=t[1],a=t[2],u=t[3],l=a-o,h=j(e,r.units,"degrees"),c=u-s,f=j(n,r.units,"degrees"),g=Math.floor(Math.abs(l)/h),p=Math.floor(Math.abs(c)/f),v=(c-p*f)/2,d=o+(l-g*h)/2,y=0;y<g;y++){for(var m=s+v,_=0;_<p;_++){var x=S([[[d,m],[d,m+f],[d+h,m+f],[d+h,m],[d,m]]],r.properties);r.mask?Oe(r.mask,x)&&i.push(x):i.push(x),m+=f}d+=h}return C(i)}function sa(t,e){return oa(t,e,e,arguments.length>2&&void 0!==arguments[2]?arguments[2]:{})}function aa(t,e){for(var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=[],i=e/ut([t[0],t[1]],[t[2],t[1]],n)*(t[2]-t[0]),o=e/ut([t[0],t[1]],[t[0],t[3]],n)*(t[3]-t[1]),s=0,a=t[0];a<=t[2];){for(var u=0,l=t[1];l<=t[3];){var h=null,c=null;s%2==0&&u%2==0?(h=S([[[a,l],[a,l+o],[a+i,l],[a,l]]],n.properties),c=S([[[a,l+o],[a+i,l+o],[a+i,l],[a,l+o]]],n.properties)):s%2==0&&u%2==1?(h=S([[[a,l],[a+i,l+o],[a+i,l],[a,l]]],n.properties),c=S([[[a,l],[a,l+o],[a+i,l+o],[a,l]]],n.properties)):u%2==0&&s%2==1?(h=S([[[a,l],[a,l+o],[a+i,l+o],[a,l]]],n.properties),c=S([[[a,l],[a+i,l+o],[a+i,l],[a,l]]],n.properties)):u%2==1&&s%2==1&&(h=S([[[a,l],[a,l+o],[a+i,l],[a,l]]],n.properties),c=S([[[a,l+o],[a+i,l+o],[a+i,l],[a,l+o]]],n.properties)),n.mask?(ta(C([n.mask,h]))&&r.push(h),ta(C([n.mask,c]))&&r.push(c)):(r.push(h),r.push(c)),l+=o,u++}s++,a+=i}return C(r)}
/*!
* MarchingSquaresJS
* version 1.3.3
* https://github.com/RaumZeit/MarchingSquares.js
*
* @license GNU Affero General Public License.
* Copyright (c) 2015-2019 Ronny Lorenz <ronny@tbi.univie.ac.at>
*/
function ua(t,e,n){return t<e?(n-t)/(e-t):(t-n)/(t-e)}function la(t,e,n,r){var i;return n>r&&(i=n,n=r,r=i),t<e?t<n?(n-t)/(e-t):(r-t)/(e-t):t>r?(t-r)/(t-e):(t-n)/(t-e)}function ha(t,e,n,r){return t<e?(n-t)/(e-t):(t-r)/(t-e)}function ca(t,e,n,r){return t<e?(r-t)/(e-t):(t-n)/(t-e)}function fa(){this.successCallback=null,this.verbose=!1,this.polygons=!1,this.polygons_full=!1,this.linearRing=!0,this.noQuadTree=!1,this.noFrame=!1}function ga(t,e,n,r){var i=[];return t.polygons.forEach((function(t){t.forEach((function(t){t[0]+=e,t[1]+=n})),r.linearRing&&t.push(t[0]),i.push(t)})),i}function pa(t,e,n,r){return 0===n?(t+=1,e+=r[0][1]):1===n?t+=r[0][0]:2===n?e+=r[0][1]:3===n&&(t+=r[0][0],e+=1),[t,e]}function va(t,e,n){return 0===n?t++:1===n||(2===n?e++:3===n&&(t++,e++)),[t,e]}function da(t,e,n,r,i){var o=r,s=i,a=0,u=0;if(this.x=e,this.y=n,this.lowerBound=null,this.upperBound=null,this.childA=null,this.childB=null,this.childC=null,this.childD=null,1===r&&1===i)this.lowerBound=Math.min(t[n][e],t[n][e+1],t[n+1][e+1],t[n+1][e]),this.upperBound=Math.max(t[n][e],t[n][e+1],t[n+1][e+1],t[n+1][e]);else{if(r>1){for(;0!==o;)o>>=1,a++;r===1<<a-1&&a--,o=1<<a-1}if(i>1){for(;0!==s;)s>>=1,u++;i===1<<u-1&&u--,s=1<<u-1}this.childA=new da(t,e,n,o,s),this.lowerBound=this.childA.lowerBound,this.upperBound=this.childA.upperBound,r-o>0&&(this.childB=new da(t,e+o,n,r-o,s),this.lowerBound=Math.min(this.lowerBound,this.childB.lowerBound),this.upperBound=Math.max(this.upperBound,this.childB.upperBound),i-s>0&&(this.childC=new da(t,e+o,n+s,r-o,i-s),this.lowerBound=Math.min(this.lowerBound,this.childC.lowerBound),this.upperBound=Math.max(this.upperBound,this.childC.upperBound))),i-s>0&&(this.childD=new da(t,e,n+s,o,i-s),this.lowerBound=Math.min(this.lowerBound,this.childD.lowerBound),this.upperBound=Math.max(this.upperBound,this.childD.upperBound))}}function ya(t){var e,n;if(!t)throw new Error("data is required");if(!Array.isArray(t)||!Array.isArray(t[0]))throw new Error("data must be scalar field, i.e. array of arrays");if(t.length<2)throw new Error("data must contain at least two rows");if((n=t[0].length)<2)throw new Error("data must contain at least two columns");for(e=1;e<t.length;e++){if(!Array.isArray(t[e]))throw new Error("Row "+e+" is not an array");if(t[e].length!=n)throw new Error("unequal row lengths detected, please provide a regular grid")}this.data=t,this.root=new da(t,0,0,t[0].length-1,t.length-1)}function ma(t,e,n){var r,i,o,s=!1,a=!1,u=null,l=null,h=null,c=null,f=null,g=[];if(!t)throw new Error("data is required");if(null==e)throw new Error("threshold is required");if(n&&"object"!==m(n))throw new Error("options must be an object");if(r=function(t){var e,n,r,i,o;for(i=new fa,t=t||{},o=Object.keys(i),e=0;e<o.length;e++)null!=(r=t[n=o[e]])&&(i[n]=r);return i.polygons_full=!i.polygons,i.interpolate=ua,i}(n),t instanceof ya)u=t,l=t.root,h=t.data,r.noQuadTree||(s=!0);else{if(!Array.isArray(t)||!Array.isArray(t[0]))throw new Error("input is neither array of arrays nor object retrieved from 'QuadTree()'");h=t}if(Array.isArray(e)){for(a=!0,r.noQuadTree||(s=!0),i=0;i<e.length;i++)if(isNaN(+e[i]))throw new Error("threshold["+i+"] is not a number")}else{if(isNaN(+e))throw new Error("threshold must be a number or array of numbers");e=[e]}return s&&!l&&(u=new ya(h),l=u.root,h=u.data),r.verbose&&(r.polygons?console.log("MarchingSquaresJS-isoLines: returning single lines (polygons) for each grid cell"):console.log("MarchingSquaresJS-isoLines: returning line paths (polygons) for entire data grid"),a&&console.log("MarchingSquaresJS-isoLines: multiple lines requested, returning array of line paths instead of lines for a single threshold")),e.forEach((function(t,e){if(f=[],r.threshold=t,r.verbose&&console.log("MarchingSquaresJS-isoLines: computing iso lines for threshold "+t),r.polygons)if(s)l.cellsBelowThreshold(r.threshold,!0).forEach((function(t){f=f.concat(ga(_a(h,t.x,t.y,r),t.x,t.y,r))}));else for(o=0;o<h.length-1;++o)for(e=0;e<h[0].length-1;++e)f=f.concat(ga(_a(h,e,o,r),e,o,r));else{for(c=[],e=0;e<h[0].length-1;++e)c[e]=[];if(s)l.cellsBelowThreshold(r.threshold,!1).forEach((function(t){c[t.x][t.y]=_a(h,t.x,t.y,r)}));else for(e=0;e<h[0].length-1;++e)for(o=0;o<h.length-1;++o)c[e][o]=_a(h,e,o,r);f=function(t,e,n){var r,i,o,s,a,u,l,h,c,f,g,p,v,d,y,_=[],x=t.length-1,E=t[0].length-1,k=["right","bottom","left","top"],b=[0,-1,0,1],w=[-1,0,1,0],I={bottom:1,left:2,top:3,right:0};return n.noFrame||function(t,e){var n,r,i,o,s;for(n=!0,r=t[0].length,i=t.length,s=0;s<i;s++)if(t[s][0]>=e||t[s][r-1]>=e){n=!1;break}if(n&&(t[i-1][0]>=e||t[i-1][r-1]>=e)&&(n=!1),n)for(o=0;o<r-1;o++)if(t[0][o]>=e||t[i-1][o]>e){n=!1;break}return n}(t,n.threshold)&&(n.linearRing?_.push([[0,0],[0,x],[E,x],[E,0],[0,0]]):_.push([[0,0],[0,x],[E,x],[E,0]])),e.forEach((function(t,N){t.forEach((function(t,S){for(r=null,i=0;i<4;i++)if(r=k[i],"object"===m(t.edges[r])){for(a=[],o=t.edges[r],u=r,l=N,h=S,c=!1,f=[N+o.path[0][0],S+o.path[0][1]],a.push(f);!c&&"object"===m((s=e[l][h]).edges[u]);)iLine truncated