Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3856a9f675 | ||
|
|
e1bb7d9320 | ||
|
|
f1bbd53634 | ||
|
|
708f539c64 | ||
|
|
e93dd9b867 | ||
|
|
a9b1d74983 | ||
|
|
c093d88677 | ||
|
|
78af860493 | ||
|
|
32a36c98ec | ||
|
|
06050b05f5 | ||
|
|
0344227a1b | ||
|
|
7933b2e86a | ||
|
|
c8b8f21d8d |
No files matched your search
+602
-102
@@ -4,14 +4,16 @@
|
||||
@inject CadastralCatalogService CatalogService
|
||||
@inject OfficialCadastreService OfficialCadastreService
|
||||
@inject LocationSearchService LocationSearchService
|
||||
@inject NetworkLocationService NetworkLocationService
|
||||
@inject AzureMapsService AzureMapsService
|
||||
@inject ProjectStorageService ProjectStorageService
|
||||
@inject MapExportService MapExportService
|
||||
@implements IAsyncDisposable
|
||||
|
||||
<PageTitle>LME Mappe Catastali</PageTitle>
|
||||
|
||||
<div class="map-app">
|
||||
<section class="map-stage">
|
||||
<section class="map-stage @(ActiveTab == "search" ? "search-active" : null)">
|
||||
<div id="map"></div>
|
||||
|
||||
<header class="map-toolbar">
|
||||
@@ -56,8 +58,29 @@
|
||||
</span>
|
||||
</label>
|
||||
}
|
||||
<label class="map-layer-option">
|
||||
<input type="checkbox" @bind="ShowSelectedParcels" @bind:after="ApplySelectedParcelsVisibility" />
|
||||
<span>
|
||||
<strong>Particelle catastali evidenziate</strong>
|
||||
<small>Contorni rossi ottenuti da ricerca o GPS</small>
|
||||
</span>
|
||||
</label>
|
||||
<label class="map-layer-option">
|
||||
<input type="checkbox" @bind="ShowImportedData" @bind:after="ApplyImportedDataVisibility" />
|
||||
<span>
|
||||
<strong>Dati importati</strong>
|
||||
<small>Particelle e geometrie verdi di file e progetti</small>
|
||||
</span>
|
||||
</label>
|
||||
<section class="layer-tree-section">
|
||||
<header>
|
||||
<strong>Ordine livelli e oggetti</strong>
|
||||
<small>Trascina dall'alto verso il basso</small>
|
||||
</header>
|
||||
<div id="layerManagerTree" class="layer-manager-tree"></div>
|
||||
</section>
|
||||
<div class="layer-panel-actions">
|
||||
<button class="secondary-command" @onclick="ClearSelectedParcels">Rimuovi 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>
|
||||
</div>
|
||||
</section>
|
||||
@@ -149,111 +172,240 @@
|
||||
</div>
|
||||
</section>
|
||||
}
|
||||
else if (ActiveTab == "data")
|
||||
{
|
||||
<section class="panel-content">
|
||||
<section class="panel-section">
|
||||
<h2>File GIS</h2>
|
||||
<label class="file-picker">
|
||||
<span>Carica KML, KMZ o GeoJSON</span>
|
||||
<input id="gisFileInput" type="file" accept=".kml,.kmz,.geojson,.json,application/vnd.google-earth.kml+xml,application/vnd.google-earth.kmz,application/geo+json" />
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="IncludeKmlSheetLayer" @bind:after="ApplyKmlSheetLayerOption" />
|
||||
<span>KML/KMZ: includi anche il layer del foglio</span>
|
||||
</label>
|
||||
<small class="field-help">
|
||||
@(IncludeKmlSheetLayer
|
||||
? "Attivato: importa foglio, particelle e altri elementi KML/KMZ."
|
||||
: "Disattivato: importa solo i poligoni delle particelle riconosciute.")
|
||||
</small>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ShowImportedData" @bind:after="ApplyImportedDataVisibility" />
|
||||
<span>Mostra particelle/dati importati in verde</span>
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ShowImportedSheetLayer" @bind:after="ApplyImportedSheetLayerVisibility" />
|
||||
<span>Mostra cornice/layer del foglio importato</span>
|
||||
</label>
|
||||
<small class="field-help">La cornice grande resta separata dalle particelle e puo essere nascosta anche nei progetti salvati.</small>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ShowImportedMeasurements" @bind:after="ApplyImportedMeasurementsVisibility" />
|
||||
<span>Mostra misure dei file caricati</span>
|
||||
</label>
|
||||
<div class="button-row">
|
||||
<button @onclick="FitImportedLayers">Inquadra dati</button>
|
||||
<button class="secondary-command" @onclick="ClearImportedLayers">Rimuovi dati</button>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="panel-section">
|
||||
<h2>Disegni e misure</h2>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ShowDrawingMeasurements" @bind:after="ApplyDrawingMeasurementsVisibility" />
|
||||
<span>Mostra superficie, perimetro e lati</span>
|
||||
</label>
|
||||
<button class="secondary-command" aria-pressed="@DrawToolsVisible" @onclick="ToggleDrawTools">
|
||||
@(DrawToolsVisible ? "Nascondi strumenti sulla mappa" : "Mostra strumenti sulla mappa")
|
||||
</button>
|
||||
<button class="danger-command" @onclick="ClearDrawings">Elimina disegni e POI</button>
|
||||
</section>
|
||||
|
||||
<section class="panel-section">
|
||||
<h2>Punti di interesse</h2>
|
||||
<label>
|
||||
Nome POI
|
||||
<input @bind="PoiName" @bind:event="oninput" placeholder="Nome del punto" />
|
||||
</label>
|
||||
<button class="primary-command" @onclick="AddProjectMarker">Aggiungi POI al centro mappa</button>
|
||||
</section>
|
||||
</section>
|
||||
}
|
||||
else if (ActiveTab == "save")
|
||||
{
|
||||
<section class="panel-content">
|
||||
<section class="panel-section">
|
||||
<h2>Esporta contenuto mappa</h2>
|
||||
<label>
|
||||
Nome file
|
||||
<input @bind="ExportFileName" @bind:event="oninput" placeholder="Es. Rilievo San Nicola" maxlength="80" />
|
||||
</label>
|
||||
<label>
|
||||
Formato
|
||||
<select @bind="ExportFormat">
|
||||
<option value="geojson">GeoJSON</option>
|
||||
<option value="kml">KML</option>
|
||||
<option value="kmz">KMZ compresso</option>
|
||||
</select>
|
||||
</label>
|
||||
<div class="export-options" role="group" aria-label="Oggetti da esportare">
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ExportImported" @bind:after="SaveFlagPreferences" />
|
||||
<span>Particelle e dati GIS importati</span>
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ExportImportedSheets" @bind:after="SaveFlagPreferences" />
|
||||
<span>Cornici, fogli e riquadri KMZ</span>
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ExportCadastral" @bind:after="SaveFlagPreferences" />
|
||||
<span>Particelle catastali rosse e GPS</span>
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ExportDrawings" @bind:after="SaveFlagPreferences" />
|
||||
<span>Disegni, aree, linee e cerchi</span>
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ExportPoi" @bind:after="SaveFlagPreferences" />
|
||||
<span>Punti di interesse</span>
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ExportTrail" @bind:after="SaveFlagPreferences" />
|
||||
<span>Traccia GPS registrata</span>
|
||||
</label>
|
||||
</div>
|
||||
<button class="primary-command" @onclick="ExportMapFile" disabled="@(ExportBusy || string.IsNullOrWhiteSpace(ExportFileName))">
|
||||
@(ExportBusy ? "Preparazione file..." : "Esporta e salva file")
|
||||
</button>
|
||||
<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>
|
||||
}
|
||||
else if (ActiveTab == "projects")
|
||||
{
|
||||
<section class="panel-content">
|
||||
<h2>File GIS</h2>
|
||||
<label class="file-picker">
|
||||
<span>Carica KML, KMZ o GeoJSON</span>
|
||||
<input id="gisFileInput" type="file" accept=".kml,.kmz,.geojson,.json,application/vnd.google-earth.kml+xml,application/vnd.google-earth.kmz,application/geo+json" />
|
||||
</label>
|
||||
<div class="button-row">
|
||||
<button @onclick="FitImportedLayers">Inquadra</button>
|
||||
<button class="secondary-command" @onclick="ClearImportedLayers">Pulisci</button>
|
||||
</div>
|
||||
<section class="panel-section">
|
||||
<h2>Salva progetto</h2>
|
||||
<label>
|
||||
Nome progetto
|
||||
<input @bind="NewProjectName" @bind:event="oninput" placeholder="Es. Rilievo San Nicola" maxlength="80" />
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="IncludeCadastralParcels" @bind:after="SaveFlagPreferences" />
|
||||
<span>Includi le particelle catastali rosse</span>
|
||||
</label>
|
||||
<button class="primary-command" @onclick="SaveProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(NewProjectName))">Salva progetto</button>
|
||||
</section>
|
||||
|
||||
<h2>Archivio progetti</h2>
|
||||
<label>
|
||||
Nome progetto
|
||||
<input @bind="NewProjectName" @bind:event="oninput" placeholder="Es. Rilievo San Nicola" maxlength="80" />
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="IncludeCadastralParcels" />
|
||||
<span>Includi le particelle catastali rosse</span>
|
||||
</label>
|
||||
<button class="primary-command" @onclick="SaveProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(NewProjectName))">Salva progetto</button>
|
||||
<section class="panel-section">
|
||||
<h2>Apri progetto</h2>
|
||||
<label>
|
||||
Progetto salvato
|
||||
<select value="@SelectedProjectId" @onchange="SelectProject" disabled="@(Projects.Count == 0 || ProjectBusy)">
|
||||
<option value="">Seleziona un progetto</option>
|
||||
@foreach (var project in Projects)
|
||||
{
|
||||
<option value="@project.Id">@project.Name - @project.UpdatedAt.ToLocalTime().ToString("dd/MM/yyyy HH:mm")</option>
|
||||
}
|
||||
</select>
|
||||
</label>
|
||||
<div class="button-row">
|
||||
<button @onclick="LoadProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Apri</button>
|
||||
<button class="danger-command" @onclick="DeleteProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Elimina</button>
|
||||
</div>
|
||||
<div class="project-archive-state">@ProjectArchiveMessage</div>
|
||||
</section>
|
||||
|
||||
<label>
|
||||
Progetto salvato
|
||||
<select value="@SelectedProjectId" @onchange="SelectProject" disabled="@(Projects.Count == 0 || ProjectBusy)">
|
||||
<option value="">Seleziona un progetto</option>
|
||||
@foreach (var project in Projects)
|
||||
{
|
||||
<option value="@project.Id">@project.Name - @project.UpdatedAt.ToLocalTime().ToString("dd/MM/yyyy HH:mm")</option>
|
||||
}
|
||||
</select>
|
||||
</label>
|
||||
<div class="button-row">
|
||||
<button @onclick="LoadProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Carica</button>
|
||||
<button class="danger-command" @onclick="DeleteProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Elimina</button>
|
||||
</div>
|
||||
<div class="project-archive-state">@ProjectArchiveMessage</div>
|
||||
|
||||
<h2>POI e disegni</h2>
|
||||
<label>
|
||||
Nome POI
|
||||
<input @bind="PoiName" @bind:event="oninput" placeholder="Nome del punto" />
|
||||
</label>
|
||||
<button class="primary-command" @onclick="AddProjectMarker">Aggiungi POI al centro mappa</button>
|
||||
<button class="secondary-command" aria-pressed="@DrawToolsVisible" @onclick="ToggleDrawTools">
|
||||
@(DrawToolsVisible ? "Nascondi strumenti di disegno" : "Mostra strumenti di disegno")
|
||||
</button>
|
||||
<button class="danger-command" @onclick="ClearDrawings">Elimina disegni e POI</button>
|
||||
<section class="panel-section">
|
||||
<h2>Visualizzazione progetto</h2>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ShowImportedData" @bind:after="ApplyImportedDataVisibility" />
|
||||
<span>Mostra particelle/dati importati in verde</span>
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ShowImportedSheetLayer" @bind:after="ApplyImportedSheetLayerVisibility" />
|
||||
<span>Mostra cornice/layer del foglio importato</span>
|
||||
</label>
|
||||
<small class="field-help">Il comando agisce subito sulla mappa e sui dati del progetto caricato.</small>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ShowImportedMeasurements" @bind:after="ApplyImportedMeasurementsVisibility" />
|
||||
<span>Mostra misure dei file caricati</span>
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ShowDrawingMeasurements" @bind:after="ApplyDrawingMeasurementsVisibility" />
|
||||
<span>Mostra misure dei disegni</span>
|
||||
</label>
|
||||
</section>
|
||||
</section>
|
||||
}
|
||||
else if (ActiveTab == "settings")
|
||||
{
|
||||
<section class="panel-content">
|
||||
<h2>Visualizzazione</h2>
|
||||
<label>
|
||||
Sfondo
|
||||
<select value="@SelectedBaseLayer" @onchange="ChangeBaseLayer">
|
||||
<option value="satellite">Satellite - Esri World Imagery</option>
|
||||
<option value="osm">Strade - OpenStreetMap</option>
|
||||
<option value="streets-esri">Strade dettagliate - Esri World Street Map</option>
|
||||
<option value="topographic">Topografica - Esri World Topographic</option>
|
||||
<option value="terrain">Terreno - OpenTopoMap</option>
|
||||
<option value="carto">Strade chiare - CARTO Voyager</option>
|
||||
<option value="azure-road">Strade - Azure Maps</option>
|
||||
<option value="azure-satellite">Satellite - Azure Maps</option>
|
||||
<option value="google-satellite">Satellite - Google Maps</option>
|
||||
<option value="google-roadmap">Strade - Google Maps</option>
|
||||
</select>
|
||||
</label>
|
||||
<label>
|
||||
Chiave Google Maps Platform
|
||||
<input type="password" @bind="GoogleMapsApiKey" placeholder="API key" autocomplete="off" />
|
||||
</label>
|
||||
<button class="secondary-command" @onclick="SaveGoogleMapsApiKey">Salva chiave Google</button>
|
||||
<label>
|
||||
Chiave sottoscrizione Azure Maps Gen2
|
||||
<input type="password" @bind="AzureMapsSubscriptionKey" placeholder="Subscription key" autocomplete="off" />
|
||||
</label>
|
||||
<button class="secondary-command" @onclick="SaveAzureMapsKey">Salva chiave Azure Maps</button>
|
||||
<div class="service-note">
|
||||
<strong>Quota gratuita Azure Maps Gen2</strong>
|
||||
<p>Include ogni mese 5.000 transazioni per le mappe stradali e 1.000 per le immagini satellitari. Ogni transazione comprende fino a 15 tessere.</p>
|
||||
</div>
|
||||
<label>
|
||||
Trasparenza catasto
|
||||
<input type="range" min="0" max="1" step="0.05" value="0.75" @onchange="ChangeCadastreOpacity" />
|
||||
</label>
|
||||
<h2>GPS e percorso</h2>
|
||||
<label class="toggle-line">
|
||||
<input type="checkbox" checked="@TrailEnabled" @onchange="ToggleTrail" />
|
||||
Registra la traccia mentre cammini
|
||||
</label>
|
||||
<section class="panel-section">
|
||||
<h2>Mappa e sfondo</h2>
|
||||
<label>
|
||||
Sfondo
|
||||
<select value="@SelectedBaseLayer" @onchange="ChangeBaseLayer">
|
||||
<option value="satellite">Satellite - Esri World Imagery</option>
|
||||
<option value="osm">Strade - OpenStreetMap</option>
|
||||
<option value="streets-esri">Strade dettagliate - Esri World Street Map</option>
|
||||
<option value="topographic">Topografica - Esri World Topographic</option>
|
||||
<option value="terrain">Terreno - OpenTopoMap</option>
|
||||
<option value="carto">Strade chiare - CARTO Voyager</option>
|
||||
<option value="azure-road">Strade - Azure Maps</option>
|
||||
<option value="azure-satellite">Satellite - Azure Maps</option>
|
||||
<option value="google-satellite">Satellite - Google Maps</option>
|
||||
<option value="google-roadmap">Strade - Google Maps</option>
|
||||
</select>
|
||||
</label>
|
||||
<label>
|
||||
Trasparenza catasto
|
||||
<input type="range" min="0" max="1" step="0.05" value="@CadastralOpacity.ToString(System.Globalization.CultureInfo.InvariantCulture)" @onchange="ChangeCadastreOpacity" />
|
||||
</label>
|
||||
</section>
|
||||
|
||||
<h2>Servizi Agenzia delle Entrate</h2>
|
||||
<div class="service-note protected-service">
|
||||
<strong>Download documenti e fogli ufficiali</strong>
|
||||
<p>Il CAPTCHA o l'accesso SPID/CIE vengono gestiti direttamente dal sito dell'Agenzia. Per sicurezza l'app non tenta di aggirarli.</p>
|
||||
<button class="primary-command" @onclick="OpenOfficialGeoportal">Apri Geoportale catastale</button>
|
||||
<button class="secondary-command" @onclick="OpenOfficialReservedArea">Apri Area riservata per download</button>
|
||||
</div>
|
||||
<section class="panel-section">
|
||||
<h2>Servizi mappa con chiave</h2>
|
||||
<label>
|
||||
Chiave Google Maps Platform
|
||||
<input type="password" @bind="GoogleMapsApiKey" placeholder="API key" autocomplete="off" />
|
||||
</label>
|
||||
<button class="secondary-command" @onclick="SaveGoogleMapsApiKey">Salva chiave Google</button>
|
||||
<label>
|
||||
Chiave sottoscrizione Azure Maps Gen2
|
||||
<input type="password" @bind="AzureMapsSubscriptionKey" placeholder="Subscription key" autocomplete="off" />
|
||||
</label>
|
||||
<button class="secondary-command" @onclick="SaveAzureMapsKey">Salva chiave Azure Maps</button>
|
||||
<div class="service-note">
|
||||
<strong>Quota gratuita Azure Maps Gen2</strong>
|
||||
<p>Include ogni mese 5.000 transazioni per le mappe stradali e 1.000 per le immagini satellitari. Ogni transazione comprende fino a 15 tessere.</p>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<button class="secondary-command" @onclick="ExportCadastralImage">Mostra vista WMS corrente</button>
|
||||
<footer>Dati catastali: Agenzia delle Entrate, licenza CC BY 4.0. App indipendente.</footer>
|
||||
<section class="panel-section">
|
||||
<h2>GPS e percorso</h2>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ShowGpsPosition" @bind:after="ApplyGpsPositionVisibility" />
|
||||
<span>Mostra punto e cerchio GPS</span>
|
||||
</label>
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="TrailEnabled" @bind:after="ApplyTrailOption" />
|
||||
<span>Registra la traccia mentre cammini</span>
|
||||
</label>
|
||||
</section>
|
||||
|
||||
<section class="panel-section">
|
||||
<h2>Servizi Agenzia delle Entrate</h2>
|
||||
<div class="service-note protected-service">
|
||||
<strong>Download documenti e fogli ufficiali</strong>
|
||||
<p>Il CAPTCHA o l'accesso SPID/CIE vengono gestiti direttamente dal sito dell'Agenzia. Per sicurezza l'app non tenta di aggirarli.</p>
|
||||
<button class="primary-command" @onclick="OpenOfficialGeoportal">Apri Geoportale catastale</button>
|
||||
<button class="secondary-command" @onclick="OpenOfficialReservedArea">Apri Area riservata per download</button>
|
||||
</div>
|
||||
<button class="secondary-command" @onclick="ExportCadastralImage">Mostra vista WMS corrente</button>
|
||||
<footer>Dati catastali: Agenzia delle Entrate, licenza CC BY 4.0. App indipendente.</footer>
|
||||
</section>
|
||||
</section>
|
||||
}
|
||||
</aside>
|
||||
@@ -283,16 +435,21 @@
|
||||
<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>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private const string FlagPreferencePrefix = "lme_flag_";
|
||||
private string ActiveTab { get; set; } = "map";
|
||||
private string SearchText { get; set; } = string.Empty;
|
||||
private string NewProjectName { get; set; } = string.Empty;
|
||||
private string ExportFileName { get; set; } = "Mappa";
|
||||
private string ExportFormat { get; set; } = "geojson";
|
||||
private string PoiName { get; set; } = string.Empty;
|
||||
private string SelectedProjectId { get; set; } = string.Empty;
|
||||
private string ProjectArchiveMessage { get; set; } = "Nessun progetto salvato.";
|
||||
@@ -306,13 +463,28 @@
|
||||
private string SelectedParcelNumber { get; set; } = string.Empty;
|
||||
private string CatalogMessage { get; set; } = string.Empty;
|
||||
private double? CatalogFraction { get; set; }
|
||||
private double CadastralOpacity { get; set; } = 0.75;
|
||||
private bool CatalogBusy { get; set; }
|
||||
private bool GpsActive { get; set; }
|
||||
private bool ShowGpsPosition { get; set; } = true;
|
||||
private bool ShowSelectedParcels { get; set; } = true;
|
||||
private bool ShowImportedData { get; set; } = true;
|
||||
private bool DrawToolsVisible { get; set; }
|
||||
private bool TrailEnabled { get; set; }
|
||||
private bool LayerPanelOpen { get; set; }
|
||||
private bool IncludeCadastralParcels { get; set; } = true;
|
||||
private bool IncludeKmlSheetLayer { get; set; }
|
||||
private bool ShowImportedSheetLayer { get; set; }
|
||||
private bool ShowImportedMeasurements { get; set; }
|
||||
private bool ShowDrawingMeasurements { get; set; } = true;
|
||||
private bool ProjectBusy { get; set; }
|
||||
private bool ExportBusy { get; set; }
|
||||
private bool ExportImported { get; set; } = true;
|
||||
private bool ExportImportedSheets { get; set; } = true;
|
||||
private bool ExportCadastral { get; set; } = true;
|
||||
private bool ExportDrawings { get; set; } = true;
|
||||
private bool ExportPoi { get; set; } = true;
|
||||
private bool ExportTrail { get; set; } = true;
|
||||
private CancellationTokenSource? CatalogCancellation { get; set; }
|
||||
private CancellationTokenSource? GpsLookupCancellation { get; set; }
|
||||
private long LastGpsLookupAt;
|
||||
@@ -333,7 +505,9 @@
|
||||
private string PanelTitle => ActiveTab switch
|
||||
{
|
||||
"cadastre" => "Ricerca catastale",
|
||||
"projects" => "Progetti e dati",
|
||||
"data" => "Dati e disegni",
|
||||
"projects" => "Archivio progetti",
|
||||
"save" => "Salvataggio ed esportazione",
|
||||
"settings" => "Impostazioni",
|
||||
_ => string.Empty
|
||||
};
|
||||
@@ -341,7 +515,9 @@
|
||||
private string PanelEyebrow => ActiveTab switch
|
||||
{
|
||||
"cadastre" => "Regione, Comune, Foglio, Particella",
|
||||
"projects" => "KML, KMZ, GeoJSON e POI",
|
||||
"data" => "File GIS, misure e POI",
|
||||
"projects" => "Salva, apri e visualizza i tuoi lavori",
|
||||
"save" => "Esporta file GIS",
|
||||
"settings" => "Mappa, GPS e servizi ufficiali",
|
||||
_ => string.Empty
|
||||
};
|
||||
@@ -358,6 +534,8 @@
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
LoadFlagPreferences();
|
||||
|
||||
try
|
||||
{
|
||||
GoogleMapsApiKey = await SecureStorage.Default.GetAsync("google_maps_api_key") ?? string.Empty;
|
||||
@@ -393,10 +571,101 @@
|
||||
if (firstRender)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.init");
|
||||
await ApplyFlagPreferencesToMapAsync();
|
||||
await CenterOnInitialLocationAsync();
|
||||
await MigrateLegacyProjectAsync();
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ConfigureProjectMapProviderAsync(string snapshot)
|
||||
{
|
||||
string? baseLayer = null;
|
||||
try
|
||||
{
|
||||
using var document = System.Text.Json.JsonDocument.Parse(snapshot);
|
||||
if (document.RootElement.TryGetProperty("displayOptions", out var displayOptions)
|
||||
&& displayOptions.TryGetProperty("baseLayer", out var baseLayerProperty))
|
||||
{
|
||||
baseLayer = baseLayerProperty.GetString();
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
if (baseLayer?.StartsWith("google-", StringComparison.Ordinal) == true
|
||||
&& !string.IsNullOrWhiteSpace(GoogleMapsApiKey))
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.configureGoogleMaps", GoogleMapsApiKey.Trim());
|
||||
}
|
||||
|
||||
if (baseLayer?.StartsWith("azure-", StringComparison.Ordinal) == true
|
||||
&& !string.IsNullOrWhiteSpace(AzureMapsSubscriptionKey))
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.configureAzureMaps", AzureMapsSubscriptionKey.Trim());
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Loading continues with the default map if the saved provider is unavailable.
|
||||
}
|
||||
}
|
||||
|
||||
private async Task CenterOnInitialLocationAsync()
|
||||
{
|
||||
NetworkLocationSnapshot? networkLocation = null;
|
||||
try
|
||||
{
|
||||
using var networkTimeout = new CancellationTokenSource(TimeSpan.FromSeconds(8));
|
||||
networkLocation = await NetworkLocationService.GetApproximateLocationAsync(networkTimeout.Token);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// An unavailable IP service must not prevent the GPS fallback.
|
||||
}
|
||||
|
||||
if (networkLocation is not null)
|
||||
{
|
||||
await JS.InvokeVoidAsync(
|
||||
"lmeMap.showInitialPosition",
|
||||
networkLocation.Latitude,
|
||||
networkLocation.Longitude,
|
||||
true,
|
||||
networkLocation.Label);
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
using var gpsTimeout = new CancellationTokenSource(TimeSpan.FromSeconds(18));
|
||||
var location = await LocationService.GetCurrentLocationAsync(gpsTimeout.Token);
|
||||
if (location is not null)
|
||||
{
|
||||
await JS.InvokeVoidAsync(
|
||||
"lmeMap.showInitialPosition",
|
||||
location.Latitude,
|
||||
location.Longitude,
|
||||
false,
|
||||
string.Empty);
|
||||
}
|
||||
else
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.showInfo", "Posizione iniziale non disponibile. La mappa resta utilizzabile normalmente.");
|
||||
}
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.showInfo", "Posizione iniziale non disponibile. Usa Avvia GPS per riprovare.");
|
||||
}
|
||||
catch (Exception error)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.showInfo", $"Posizione iniziale non disponibile: {error.GetBaseException().Message}");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task MigrateLegacyProjectAsync()
|
||||
{
|
||||
try
|
||||
@@ -435,11 +704,19 @@
|
||||
}
|
||||
await Task.Delay(30);
|
||||
await JS.InvokeVoidAsync("lmeMap.resize");
|
||||
if (LayerPanelOpen)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.refreshLayerManager");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ToggleLayerPanel()
|
||||
{
|
||||
LayerPanelOpen = !LayerPanelOpen;
|
||||
if (!LayerPanelOpen)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.clearLayerManagerSelection");
|
||||
}
|
||||
if (LayerPanelOpen)
|
||||
{
|
||||
ActiveTab = "map";
|
||||
@@ -447,6 +724,10 @@
|
||||
|
||||
await Task.Delay(30);
|
||||
await JS.InvokeVoidAsync("lmeMap.resize");
|
||||
if (LayerPanelOpen)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.refreshLayerManager");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task SearchLocation()
|
||||
@@ -620,6 +901,12 @@
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ApplyGpsPositionVisibility()
|
||||
{
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.setGpsPositionVisible", ShowGpsPosition);
|
||||
}
|
||||
|
||||
private async Task StartGps()
|
||||
{
|
||||
GpsActive = true;
|
||||
@@ -726,11 +1013,44 @@
|
||||
}
|
||||
|
||||
private Task FitImportedLayers() => JS.InvokeVoidAsync("lmeMap.fitImported").AsTask();
|
||||
private Task ClearImportedLayers() => JS.InvokeVoidAsync("lmeMap.clearImported").AsTask();
|
||||
private async Task ClearImportedLayers()
|
||||
{
|
||||
ShowImportedSheetLayer = false;
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.clearImported");
|
||||
}
|
||||
private Task AddProjectMarker() => JS.InvokeVoidAsync("lmeMap.addProjectMarker", PoiName).AsTask();
|
||||
|
||||
private async Task ApplyKmlSheetLayerOption()
|
||||
{
|
||||
ShowImportedSheetLayer = IncludeKmlSheetLayer;
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.setIncludeKmlSheetLayer", IncludeKmlSheetLayer);
|
||||
await JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer);
|
||||
}
|
||||
|
||||
private Task ApplyImportedSheetLayerVisibility()
|
||||
{
|
||||
SaveFlagPreferences();
|
||||
return JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer).AsTask();
|
||||
}
|
||||
|
||||
private async Task ApplyImportedMeasurementsVisibility()
|
||||
{
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.setImportedMeasurementsVisible", ShowImportedMeasurements);
|
||||
}
|
||||
|
||||
private async Task ApplyDrawingMeasurementsVisibility()
|
||||
{
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.setDrawingMeasurementsVisible", ShowDrawingMeasurements);
|
||||
}
|
||||
|
||||
private async Task ToggleDrawTools()
|
||||
{
|
||||
DrawToolsVisible = !DrawToolsVisible;
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.setDrawToolsVisible", DrawToolsVisible);
|
||||
|
||||
if (DrawToolsVisible)
|
||||
@@ -766,6 +1086,47 @@
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private async Task ExportMapFile()
|
||||
{
|
||||
if (!ExportImported && !ExportImportedSheets && !ExportCadastral
|
||||
&& !ExportDrawings && !ExportPoi && !ExportTrail)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.showInfo", "Seleziona almeno un tipo di oggetto da esportare.");
|
||||
return;
|
||||
}
|
||||
|
||||
ExportBusy = true;
|
||||
try
|
||||
{
|
||||
var geoJson = await JS.InvokeAsync<string>("lmeMap.createMapExportGeoJson", new
|
||||
{
|
||||
includeImported = ExportImported,
|
||||
includeImportedSheets = ExportImportedSheets,
|
||||
includeCadastral = ExportCadastral,
|
||||
includeDrawings = ExportDrawings,
|
||||
includePoi = ExportPoi,
|
||||
includeTrail = ExportTrail
|
||||
});
|
||||
var exported = await MapExportService.CreateAsync(ExportFileName, ExportFormat, geoJson);
|
||||
await Share.Default.RequestAsync(new ShareFileRequest
|
||||
{
|
||||
Title = $"Salva o condividi {exported.FileName}",
|
||||
File = new ShareFile(exported.Path, exported.MimeType)
|
||||
});
|
||||
await JS.InvokeVoidAsync(
|
||||
"lmeMap.showInfo",
|
||||
$"File {exported.FileName} pronto: {exported.FeatureCount} oggetti esportati.");
|
||||
}
|
||||
catch (Exception error)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.showInfo", $"Esportazione non riuscita: {error.GetBaseException().Message}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
ExportBusy = false;
|
||||
}
|
||||
}
|
||||
|
||||
private async Task SaveProject()
|
||||
{
|
||||
var name = NewProjectName.Trim();
|
||||
@@ -824,8 +1185,11 @@
|
||||
try
|
||||
{
|
||||
var snapshot = await ProjectStorageService.LoadAsync(project.Id);
|
||||
await JS.InvokeVoidAsync("lmeMap.loadProjectSnapshot", snapshot, project.Name);
|
||||
await ConfigureProjectMapProviderAsync(snapshot);
|
||||
var displayOptions = await JS.InvokeAsync<ProjectDisplayOptions>("lmeMap.loadProjectSnapshot", snapshot, project.Name);
|
||||
ApplyProjectDisplayOptions(displayOptions);
|
||||
NewProjectName = project.Name;
|
||||
ExportFileName = project.Name;
|
||||
IncludeCadastralParcels = project.IncludesCadastralParcels;
|
||||
ActiveTab = "map";
|
||||
await Task.Delay(30);
|
||||
@@ -841,6 +1205,28 @@
|
||||
}
|
||||
}
|
||||
|
||||
private void ApplyProjectDisplayOptions(ProjectDisplayOptions options)
|
||||
{
|
||||
SelectedBaseLayer = options.BaseLayer;
|
||||
CadastralOpacity = options.CadastreOpacity;
|
||||
IncludeKmlSheetLayer = options.IncludeKmlSheetLayer;
|
||||
ShowImportedData = options.ImportedVisible;
|
||||
ShowImportedSheetLayer = options.ImportedSheetsVisible;
|
||||
ShowImportedMeasurements = options.ShowImportedMeasurements;
|
||||
ShowDrawingMeasurements = options.ShowDrawingMeasurements;
|
||||
DrawToolsVisible = options.DrawToolsVisible;
|
||||
ShowGpsPosition = options.GpsPositionVisible;
|
||||
ShowSelectedParcels = options.SelectedParcelsVisible;
|
||||
TrailEnabled = options.TrailEnabled;
|
||||
|
||||
var activeLayers = (options.CadastreLayers ?? []).ToHashSet(StringComparer.Ordinal);
|
||||
foreach (var layer in CadastralLayers)
|
||||
{
|
||||
layer.Enabled = activeLayers.Contains(layer.Key);
|
||||
}
|
||||
SaveFlagPreferences();
|
||||
}
|
||||
|
||||
private async Task DeleteProject()
|
||||
{
|
||||
var project = Projects.FirstOrDefault(item => item.Id == SelectedProjectId);
|
||||
@@ -871,9 +1257,9 @@
|
||||
}
|
||||
}
|
||||
private Task CenterOnGps() => JS.InvokeVoidAsync("lmeMap.centerOnGps").AsTask();
|
||||
private async Task ToggleTrail(ChangeEventArgs args)
|
||||
private async Task ApplyTrailOption()
|
||||
{
|
||||
TrailEnabled = (bool?)args.Value == true;
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.toggleTrail", TrailEnabled);
|
||||
}
|
||||
private async Task ChangeBaseLayer(ChangeEventArgs args)
|
||||
@@ -962,14 +1348,112 @@
|
||||
await JS.InvokeVoidAsync("lmeMap.showInfo", $"Chiave Azure Maps non salvata: {error.GetBaseException().Message}");
|
||||
}
|
||||
}
|
||||
private Task ChangeCadastreOpacity(ChangeEventArgs args) => JS.InvokeVoidAsync("lmeMap.setCadastreOpacity", args.Value?.ToString()).AsTask();
|
||||
private async Task ChangeCadastreOpacity(ChangeEventArgs args)
|
||||
{
|
||||
var text = args.Value?.ToString();
|
||||
if (!double.TryParse(text, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, out var value)
|
||||
&& !double.TryParse(text, out value))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
CadastralOpacity = Math.Clamp(value, 0, 1);
|
||||
await JS.InvokeVoidAsync("lmeMap.setCadastreOpacity", CadastralOpacity);
|
||||
}
|
||||
|
||||
private async Task ToggleCadastreLayer(CadastralLayer layer, ChangeEventArgs args)
|
||||
{
|
||||
layer.Enabled = args.Value is true;
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.toggleCadastreLayer", layer.Key, layer.Enabled);
|
||||
}
|
||||
|
||||
private void LoadFlagPreferences()
|
||||
{
|
||||
IncludeCadastralParcels = GetFlagPreference("include_cadastral_parcels", true);
|
||||
IncludeKmlSheetLayer = GetFlagPreference("include_kml_sheet_layer", false);
|
||||
ShowImportedData = GetFlagPreference("show_imported_data", true);
|
||||
ShowImportedSheetLayer = GetFlagPreference("show_imported_sheet_layer", false);
|
||||
ShowImportedMeasurements = GetFlagPreference("show_imported_measurements", false);
|
||||
ShowDrawingMeasurements = GetFlagPreference("show_drawing_measurements", true);
|
||||
DrawToolsVisible = GetFlagPreference("draw_tools_visible", false);
|
||||
ShowGpsPosition = GetFlagPreference("show_gps_position", true);
|
||||
ShowSelectedParcels = GetFlagPreference("show_selected_parcels", true);
|
||||
TrailEnabled = GetFlagPreference("trail_enabled", false);
|
||||
ExportImported = GetFlagPreference("export_imported", true);
|
||||
ExportImportedSheets = GetFlagPreference("export_imported_sheets", true);
|
||||
ExportCadastral = GetFlagPreference("export_cadastral", true);
|
||||
ExportDrawings = GetFlagPreference("export_drawings", true);
|
||||
ExportPoi = GetFlagPreference("export_poi", true);
|
||||
ExportTrail = GetFlagPreference("export_trail", true);
|
||||
|
||||
foreach (var layer in CadastralLayers)
|
||||
{
|
||||
layer.Enabled = GetFlagPreference($"cadastre_layer_{layer.Key}", layer.Enabled);
|
||||
}
|
||||
}
|
||||
|
||||
private void SaveFlagPreferences()
|
||||
{
|
||||
SetFlagPreference("include_cadastral_parcels", IncludeCadastralParcels);
|
||||
SetFlagPreference("include_kml_sheet_layer", IncludeKmlSheetLayer);
|
||||
SetFlagPreference("show_imported_data", ShowImportedData);
|
||||
SetFlagPreference("show_imported_sheet_layer", ShowImportedSheetLayer);
|
||||
SetFlagPreference("show_imported_measurements", ShowImportedMeasurements);
|
||||
SetFlagPreference("show_drawing_measurements", ShowDrawingMeasurements);
|
||||
SetFlagPreference("draw_tools_visible", DrawToolsVisible);
|
||||
SetFlagPreference("show_gps_position", ShowGpsPosition);
|
||||
SetFlagPreference("show_selected_parcels", ShowSelectedParcels);
|
||||
SetFlagPreference("trail_enabled", TrailEnabled);
|
||||
SetFlagPreference("export_imported", ExportImported);
|
||||
SetFlagPreference("export_imported_sheets", ExportImportedSheets);
|
||||
SetFlagPreference("export_cadastral", ExportCadastral);
|
||||
SetFlagPreference("export_drawings", ExportDrawings);
|
||||
SetFlagPreference("export_poi", ExportPoi);
|
||||
SetFlagPreference("export_trail", ExportTrail);
|
||||
|
||||
foreach (var layer in CadastralLayers)
|
||||
{
|
||||
SetFlagPreference($"cadastre_layer_{layer.Key}", layer.Enabled);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ApplyFlagPreferencesToMapAsync()
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.setIncludeKmlSheetLayer", IncludeKmlSheetLayer);
|
||||
await JS.InvokeVoidAsync("lmeMap.setImportedLayerVisible", ShowImportedData);
|
||||
await JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer);
|
||||
await JS.InvokeVoidAsync("lmeMap.setImportedMeasurementsVisible", ShowImportedMeasurements);
|
||||
await JS.InvokeVoidAsync("lmeMap.setDrawingMeasurementsVisible", ShowDrawingMeasurements);
|
||||
await JS.InvokeVoidAsync("lmeMap.setDrawToolsVisible", DrawToolsVisible);
|
||||
await JS.InvokeVoidAsync("lmeMap.setGpsPositionVisible", ShowGpsPosition);
|
||||
await JS.InvokeVoidAsync("lmeMap.setSelectedParcelsVisible", ShowSelectedParcels);
|
||||
await JS.InvokeVoidAsync("lmeMap.toggleTrail", TrailEnabled);
|
||||
|
||||
foreach (var layer in CadastralLayers)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.toggleCadastreLayer", layer.Key, layer.Enabled);
|
||||
}
|
||||
}
|
||||
|
||||
private static bool GetFlagPreference(string name, bool defaultValue) =>
|
||||
Preferences.Default.Get($"{FlagPreferencePrefix}{name}", defaultValue);
|
||||
|
||||
private static void SetFlagPreference(string name, bool value) =>
|
||||
Preferences.Default.Set($"{FlagPreferencePrefix}{name}", value);
|
||||
|
||||
private async Task ApplySelectedParcelsVisibility()
|
||||
{
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.setSelectedParcelsVisible", ShowSelectedParcels);
|
||||
}
|
||||
|
||||
private async Task ApplyImportedDataVisibility()
|
||||
{
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.setImportedLayerVisible", ShowImportedData);
|
||||
}
|
||||
|
||||
private async Task ExportCadastralImage()
|
||||
{
|
||||
ActiveTab = "map";
|
||||
@@ -997,6 +1481,22 @@
|
||||
public string Detail { get; } = detail;
|
||||
}
|
||||
|
||||
private sealed class ProjectDisplayOptions
|
||||
{
|
||||
public string BaseLayer { get; init; } = "satellite";
|
||||
public double CadastreOpacity { get; init; } = 0.75;
|
||||
public string[] CadastreLayers { get; init; } = [];
|
||||
public bool IncludeKmlSheetLayer { get; init; }
|
||||
public bool ImportedVisible { get; init; } = true;
|
||||
public bool ImportedSheetsVisible { get; init; }
|
||||
public bool ShowImportedMeasurements { get; init; }
|
||||
public bool ShowDrawingMeasurements { get; init; } = true;
|
||||
public bool DrawToolsVisible { get; init; }
|
||||
public bool GpsPositionVisible { get; init; } = true;
|
||||
public bool SelectedParcelsVisible { get; init; } = true;
|
||||
public bool TrailEnabled { get; init; }
|
||||
}
|
||||
|
||||
public ValueTask DisposeAsync()
|
||||
{
|
||||
CancelCatalogWork();
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
<ApplicationId>com.companyname.lmemappecatastaliapp</ApplicationId>
|
||||
|
||||
<!-- Versions -->
|
||||
<ApplicationDisplayVersion>0.2.7</ApplicationDisplayVersion>
|
||||
<ApplicationVersion>11</ApplicationVersion>
|
||||
<ApplicationDisplayVersion>0.2.20</ApplicationDisplayVersion>
|
||||
<ApplicationVersion>24</ApplicationVersion>
|
||||
|
||||
<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
|
||||
<WindowsPackageType>None</WindowsPackageType>
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<!-- App Icon -->
|
||||
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
|
||||
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#075E54" />
|
||||
|
||||
<!-- Splash Screen -->
|
||||
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
|
||||
|
||||
@@ -20,8 +20,10 @@ public static class MauiProgram
|
||||
builder.Services.AddSingleton<CadastralCatalogService>();
|
||||
builder.Services.AddSingleton<OfficialCadastreService>();
|
||||
builder.Services.AddSingleton<LocationSearchService>();
|
||||
builder.Services.AddSingleton<NetworkLocationService>();
|
||||
builder.Services.AddSingleton<AzureMapsService>();
|
||||
builder.Services.AddSingleton<ProjectStorageService>();
|
||||
builder.Services.AddSingleton<MapExportService>();
|
||||
|
||||
#if DEBUG
|
||||
builder.Services.AddBlazorWebViewDeveloperTools();
|
||||
|
||||
@@ -9,22 +9,30 @@ App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata pe
|
||||
- Trasparenza configurabile del layer catastale.
|
||||
- Interrogazione WMS con click/tap sulla mappa.
|
||||
- Import di file KML, KMZ, GeoJSON e JSON.
|
||||
- Import GeoJSON compatibile con BOM, geometrie singole, array, FeatureCollection e coordinate Web Mercator EPSG:3857.
|
||||
- Filtro KML/KMZ `solo particelle` attivo per impostazione predefinita, con separazione dei MultiPolygon ed esclusione di GroundOverlay e perimetri del foglio; il layer foglio resta importabile e puo essere mostrato o nascosto separatamente.
|
||||
- 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.
|
||||
- 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.
|
||||
- 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.
|
||||
- Archivio multiprogetto nella cartella privata dell'app, con nome, selezione da elenco, sovrascrittura ed eliminazione.
|
||||
- Ogni progetto salva file GIS, POI, disegni, traccia e inquadratura; l'inclusione delle particelle catastali rosse e' opzionale.
|
||||
- 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.
|
||||
- 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.
|
||||
- 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.
|
||||
- Punto e cerchio di precisione del GPS live possono essere mostrati o nascosti dalle impostazioni senza fermare il rilevamento.
|
||||
- Marker posizione, cerchio accuratezza in metri, tracciamento percorso.
|
||||
- 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.
|
||||
- Mappa a tutto schermo con tab Catasto, Progetti e Impostazioni, adattabile agli schermi pieghevoli.
|
||||
- Mappa a tutto schermo con tab separati Catasto, Dati, Salvataggio e Impostazioni, adattabile agli schermi pieghevoli.
|
||||
- Ingrandimento oltre lo zoom satellitare nativo senza tessere "Map data not yet available".
|
||||
- Tendine concatenate Regione, Comune, Foglio e Particella.
|
||||
- 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.
|
||||
- Ricerca catastale eseguita dal codice .NET nativo, senza DuckDB WebAssembly nella WebView Android.
|
||||
- La registrazione della traccia GPS e' disattivata all'avvio; la toolbar di disegno puo' essere mostrata o nascosta dal tab Progetti.
|
||||
- La registrazione della traccia GPS e' disattivata all'avvio; la toolbar di disegno completa puo' essere mostrata o nascosta dal tab Dati.
|
||||
- Pannello `Layer` accessibile direttamente dalla mappa, con checkbox sincronizzati per confini, numeri particella, fogli, fabbricati, strade e acque.
|
||||
- Le particelle cercate possono essere aggiunte una dopo l'altra, mantenendo contemporaneamente sulla mappa tutti i confini selezionati.
|
||||
- Comandi separati per rimuovere le particelle selezionate o pulire importazioni, disegni, POI e traccia GPS.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||
<rect x="0" y="0" width="456" height="456" fill="#512BD4" />
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="456" height="456" viewBox="0 0 456 456" xmlns="http://www.w3.org/2000/svg">
|
||||
<rect width="456" height="456" fill="#075E54" />
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 228 B After Width: | Height: | Size: 187 B |
@@ -1,8 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
|
||||
<path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
|
||||
<path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
|
||||
<path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
|
||||
<path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="456" height="456" viewBox="0 0 456 456" xmlns="http://www.w3.org/2000/svg">
|
||||
<g stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M105 150L183 119L273 151L351 120V307L273 338L183 306L105 337Z"
|
||||
fill="#F7FAF5" stroke="#E1ECE5" stroke-width="10" />
|
||||
<path d="M183 119V306M273 151V338" fill="none" stroke="#83B6A5" stroke-width="10" />
|
||||
<path d="M125 190L162 175M124 274L160 260M293 196L330 181M295 282L330 268"
|
||||
fill="none" stroke="#A9CDBE" stroke-width="9" />
|
||||
<path d="M228 104C188 104 157 135 157 175C157 225 228 294 228 294C228 294 299 225 299 175C299 135 268 104 228 104Z"
|
||||
fill="#F97316" stroke="#FFFFFF" stroke-width="12" />
|
||||
<circle cx="228" cy="175" r="24" fill="#FFFFFF" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 834 B |
@@ -13,7 +13,7 @@ public sealed class AzureMapsService
|
||||
|
||||
public AzureMapsService()
|
||||
{
|
||||
_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.7");
|
||||
_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.20");
|
||||
_httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/json");
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,231 @@
|
||||
using System.Globalization;
|
||||
using System.IO.Compression;
|
||||
using System.Text;
|
||||
using System.Text.Json;
|
||||
using System.Xml.Linq;
|
||||
|
||||
namespace LMEMappeCatastaliApp.Services;
|
||||
|
||||
public sealed class MapExportService
|
||||
{
|
||||
private static readonly XNamespace Kml = "http://www.opengis.net/kml/2.2";
|
||||
|
||||
public async Task<MapExportFile> CreateAsync(
|
||||
string requestedName,
|
||||
string requestedFormat,
|
||||
string geoJson,
|
||||
CancellationToken cancellationToken = default)
|
||||
{
|
||||
using var document = JsonDocument.Parse(geoJson);
|
||||
var root = document.RootElement;
|
||||
if (!root.TryGetProperty("type", out var type) || type.GetString() != "FeatureCollection"
|
||||
|| !root.TryGetProperty("features", out var features)
|
||||
|| features.ValueKind != JsonValueKind.Array)
|
||||
{
|
||||
throw new InvalidDataException("I dati raccolti dalla mappa non sono validi.");
|
||||
}
|
||||
|
||||
var featureCount = features.GetArrayLength();
|
||||
if (featureCount == 0)
|
||||
{
|
||||
throw new InvalidOperationException("Nessun oggetto selezionato e disponibile da esportare.");
|
||||
}
|
||||
|
||||
var format = requestedFormat.Trim().ToLowerInvariant() switch
|
||||
{
|
||||
"kml" => "kml",
|
||||
"kmz" => "kmz",
|
||||
_ => "geojson"
|
||||
};
|
||||
var baseName = NormalizeFileName(requestedName);
|
||||
var exportDirectory = Path.Combine(FileSystem.CacheDirectory, "Exports");
|
||||
Directory.CreateDirectory(exportDirectory);
|
||||
var path = Path.Combine(exportDirectory, $"{baseName}.{format}");
|
||||
|
||||
if (format == "geojson")
|
||||
{
|
||||
using var output = File.Create(path);
|
||||
await JsonSerializer.SerializeAsync(output, root, new JsonSerializerOptions { WriteIndented = true }, cancellationToken);
|
||||
return new(path, "application/geo+json", featureCount, Path.GetFileName(path));
|
||||
}
|
||||
|
||||
var kml = BuildKml(features, baseName);
|
||||
if (format == "kml")
|
||||
{
|
||||
await File.WriteAllTextAsync(path, kml, new UTF8Encoding(false), cancellationToken);
|
||||
return new(path, "application/vnd.google-earth.kml+xml", featureCount, Path.GetFileName(path));
|
||||
}
|
||||
|
||||
await using (var output = File.Create(path))
|
||||
using (var archive = new ZipArchive(output, ZipArchiveMode.Create))
|
||||
{
|
||||
var entry = archive.CreateEntry("doc.kml", CompressionLevel.Optimal);
|
||||
await using var entryStream = entry.Open();
|
||||
await using var writer = new StreamWriter(entryStream, new UTF8Encoding(false));
|
||||
await writer.WriteAsync(kml.AsMemory(), cancellationToken);
|
||||
}
|
||||
return new(path, "application/vnd.google-earth.kmz", featureCount, Path.GetFileName(path));
|
||||
}
|
||||
|
||||
private static string BuildKml(JsonElement features, string documentName)
|
||||
{
|
||||
var document = new XElement(Kml + "Document",
|
||||
new XElement(Kml + "name", documentName),
|
||||
BuildStyle("imported", "ff2ecc71", "402ecc71"),
|
||||
BuildStyle("imported-sheet", "ff22803d", "1022803d"),
|
||||
BuildStyle("cadastral", "ff4444ef", "4224bffb"),
|
||||
BuildStyle("cadastral-gps", "ffff7a00", "337aff00"),
|
||||
BuildStyle("drawing", "ff1679f9", "333c92fb"),
|
||||
BuildStyle("poi", "ffff7a00", "33ff7a00"),
|
||||
BuildStyle("gps-trail", "ff00a5ff", "2200a5ff"));
|
||||
|
||||
foreach (var feature in features.EnumerateArray())
|
||||
{
|
||||
if (!feature.TryGetProperty("geometry", out var geometry)
|
||||
|| geometry.ValueKind is JsonValueKind.Null or JsonValueKind.Undefined)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var properties = feature.TryGetProperty("properties", out var propertyElement)
|
||||
&& propertyElement.ValueKind == JsonValueKind.Object
|
||||
? propertyElement
|
||||
: default;
|
||||
var category = GetString(properties, "_lmeCategory") ?? "drawing";
|
||||
var placemark = new XElement(Kml + "Placemark",
|
||||
new XElement(Kml + "name", FeatureName(properties, category)),
|
||||
new XElement(Kml + "styleUrl", $"#{NormalizeStyleId(category)}"));
|
||||
|
||||
var extendedData = BuildExtendedData(properties);
|
||||
if (extendedData is not null)
|
||||
{
|
||||
placemark.Add(extendedData);
|
||||
}
|
||||
placemark.Add(BuildGeometry(geometry));
|
||||
document.Add(placemark);
|
||||
}
|
||||
|
||||
return new XDocument(new XDeclaration("1.0", "utf-8", null), new XElement(Kml + "kml", document)).ToString();
|
||||
}
|
||||
|
||||
private static XElement BuildStyle(string id, string lineColor, string fillColor) =>
|
||||
new(Kml + "Style",
|
||||
new XAttribute("id", id),
|
||||
new XElement(Kml + "LineStyle",
|
||||
new XElement(Kml + "color", lineColor),
|
||||
new XElement(Kml + "width", 3)),
|
||||
new XElement(Kml + "PolyStyle", new XElement(Kml + "color", fillColor)));
|
||||
|
||||
private static XElement? BuildExtendedData(JsonElement properties)
|
||||
{
|
||||
if (properties.ValueKind != JsonValueKind.Object)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var data = properties.EnumerateObject()
|
||||
.Where(item => item.Name != "_lmeCategory"
|
||||
&& item.Value.ValueKind is JsonValueKind.String or JsonValueKind.Number or JsonValueKind.True or JsonValueKind.False)
|
||||
.Select(item => new XElement(Kml + "Data",
|
||||
new XAttribute("name", item.Name),
|
||||
new XElement(Kml + "value", ScalarText(item.Value))))
|
||||
.ToArray();
|
||||
return data.Length == 0 ? null : new XElement(Kml + "ExtendedData", data);
|
||||
}
|
||||
|
||||
private static XElement BuildGeometry(JsonElement geometry)
|
||||
{
|
||||
var type = geometry.GetProperty("type").GetString();
|
||||
if (type == "GeometryCollection")
|
||||
{
|
||||
return new XElement(Kml + "MultiGeometry",
|
||||
geometry.GetProperty("geometries").EnumerateArray().Select(BuildGeometry));
|
||||
}
|
||||
|
||||
var coordinates = geometry.GetProperty("coordinates");
|
||||
return type switch
|
||||
{
|
||||
"Point" => new XElement(Kml + "Point", CoordinatesElement([coordinates])),
|
||||
"LineString" => new XElement(Kml + "LineString", CoordinatesElement(coordinates.EnumerateArray())),
|
||||
"Polygon" => BuildPolygon(coordinates),
|
||||
"MultiPoint" => new XElement(Kml + "MultiGeometry",
|
||||
coordinates.EnumerateArray().Select(point => new XElement(Kml + "Point", CoordinatesElement([point])))),
|
||||
"MultiLineString" => new XElement(Kml + "MultiGeometry",
|
||||
coordinates.EnumerateArray().Select(line => new XElement(Kml + "LineString", CoordinatesElement(line.EnumerateArray())))),
|
||||
"MultiPolygon" => new XElement(Kml + "MultiGeometry", coordinates.EnumerateArray().Select(BuildPolygon)),
|
||||
_ => throw new InvalidDataException($"Geometria GeoJSON non supportata: {type}.")
|
||||
};
|
||||
}
|
||||
|
||||
private static XElement BuildPolygon(JsonElement rings)
|
||||
{
|
||||
var ringList = rings.EnumerateArray().ToArray();
|
||||
var polygon = new XElement(Kml + "Polygon");
|
||||
if (ringList.Length > 0)
|
||||
{
|
||||
polygon.Add(new XElement(Kml + "outerBoundaryIs",
|
||||
new XElement(Kml + "LinearRing", CoordinatesElement(ringList[0].EnumerateArray()))));
|
||||
}
|
||||
foreach (var ring in ringList.Skip(1))
|
||||
{
|
||||
polygon.Add(new XElement(Kml + "innerBoundaryIs",
|
||||
new XElement(Kml + "LinearRing", CoordinatesElement(ring.EnumerateArray()))));
|
||||
}
|
||||
return polygon;
|
||||
}
|
||||
|
||||
private static XElement CoordinatesElement(IEnumerable<JsonElement> points) =>
|
||||
new(Kml + "coordinates", string.Join(" ", points.Select(FormatCoordinate)));
|
||||
|
||||
private static string FormatCoordinate(JsonElement coordinate)
|
||||
{
|
||||
var values = coordinate.EnumerateArray().Take(3)
|
||||
.Select(value => value.GetDouble().ToString("G17", CultureInfo.InvariantCulture));
|
||||
return string.Join(",", values);
|
||||
}
|
||||
|
||||
private static string FeatureName(JsonElement properties, string category) =>
|
||||
GetString(properties, "name")
|
||||
?? GetString(properties, "Name")
|
||||
?? GetString(properties, "LABEL")
|
||||
?? GetString(properties, "NATIONALCADASTRALREFERENCE")
|
||||
?? category switch
|
||||
{
|
||||
"imported-sheet" => "Cornice o foglio importato",
|
||||
"cadastral" => "Particella catastale",
|
||||
"cadastral-gps" => "Particella GPS",
|
||||
"poi" => "Punto di interesse",
|
||||
"gps-trail" => "Traccia GPS",
|
||||
_ => "Oggetto mappa"
|
||||
};
|
||||
|
||||
private static string? GetString(JsonElement element, string name) =>
|
||||
element.ValueKind == JsonValueKind.Object
|
||||
&& element.TryGetProperty(name, out var value)
|
||||
&& value.ValueKind == JsonValueKind.String
|
||||
? value.GetString()
|
||||
: null;
|
||||
|
||||
private static string ScalarText(JsonElement value) => value.ValueKind == JsonValueKind.String
|
||||
? value.GetString() ?? string.Empty
|
||||
: value.GetRawText();
|
||||
|
||||
private static string NormalizeStyleId(string category) => category switch
|
||||
{
|
||||
"imported" or "imported-sheet" or "cadastral" or "cadastral-gps" or "drawing" or "poi" or "gps-trail" => category,
|
||||
_ => "drawing"
|
||||
};
|
||||
|
||||
private static string NormalizeFileName(string requestedName)
|
||||
{
|
||||
var name = string.IsNullOrWhiteSpace(requestedName) ? "Mappa" : requestedName.Trim();
|
||||
foreach (var invalid in Path.GetInvalidFileNameChars())
|
||||
{
|
||||
name = name.Replace(invalid, '_');
|
||||
}
|
||||
name = Path.GetFileNameWithoutExtension(name).Trim().TrimEnd('.');
|
||||
return string.IsNullOrWhiteSpace(name) ? "Mappa" : name[..Math.Min(name.Length, 80)];
|
||||
}
|
||||
}
|
||||
|
||||
public sealed record MapExportFile(string Path, string MimeType, int FeatureCount, string FileName);
|
||||
@@ -0,0 +1,74 @@
|
||||
using System.Net.Http.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Microsoft.Maui.Networking;
|
||||
|
||||
namespace LMEMappeCatastaliApp.Services;
|
||||
|
||||
public sealed class NetworkLocationService
|
||||
{
|
||||
private readonly HttpClient httpClient = new()
|
||||
{
|
||||
Timeout = TimeSpan.FromSeconds(6)
|
||||
};
|
||||
|
||||
public NetworkLocationService()
|
||||
{
|
||||
httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.20");
|
||||
}
|
||||
|
||||
public async Task<NetworkLocationSnapshot?> GetApproximateLocationAsync(
|
||||
CancellationToken cancellationToken = default)
|
||||
{
|
||||
if (Connectivity.Current.NetworkAccess != NetworkAccess.Internet)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
using var response = await httpClient.GetAsync("https://ipapi.co/json/", cancellationToken);
|
||||
if (!response.IsSuccessStatusCode)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var result = await response.Content.ReadFromJsonAsync<IpLocationResponse>(cancellationToken);
|
||||
if (result is null
|
||||
|| result.Error == true
|
||||
|| !result.Latitude.HasValue
|
||||
|| !result.Longitude.HasValue
|
||||
|| Math.Abs(result.Latitude.Value) > 90
|
||||
|| Math.Abs(result.Longitude.Value) > 180)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var labelParts = new[] { result.City, result.Region, result.CountryName }
|
||||
.Where(value => !string.IsNullOrWhiteSpace(value));
|
||||
return new NetworkLocationSnapshot(
|
||||
result.Latitude.Value,
|
||||
result.Longitude.Value,
|
||||
string.Join(", ", labelParts));
|
||||
}
|
||||
|
||||
private sealed class IpLocationResponse
|
||||
{
|
||||
[JsonPropertyName("latitude")]
|
||||
public double? Latitude { get; init; }
|
||||
|
||||
[JsonPropertyName("longitude")]
|
||||
public double? Longitude { get; init; }
|
||||
|
||||
[JsonPropertyName("city")]
|
||||
public string? City { get; init; }
|
||||
|
||||
[JsonPropertyName("region")]
|
||||
public string? Region { get; init; }
|
||||
|
||||
[JsonPropertyName("country_name")]
|
||||
public string? CountryName { get; init; }
|
||||
|
||||
[JsonPropertyName("error")]
|
||||
public bool? Error { get; init; }
|
||||
}
|
||||
}
|
||||
|
||||
public sealed record NetworkLocationSnapshot(double Latitude, double Longitude, string Label);
|
||||
@@ -20,6 +20,37 @@ public sealed class PreciseLocationService : IAsyncDisposable
|
||||
return status;
|
||||
}
|
||||
|
||||
public async Task<LocationSnapshot?> GetCurrentLocationAsync(CancellationToken cancellationToken = default)
|
||||
{
|
||||
var permission = await EnsurePermissionAsync();
|
||||
if (permission != PermissionStatus.Granted)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
Location? location = null;
|
||||
try
|
||||
{
|
||||
var request = new GeolocationRequest(GeolocationAccuracy.Best, TimeSpan.FromSeconds(8));
|
||||
location = await Geolocation.Default.GetLocationAsync(request, cancellationToken);
|
||||
}
|
||||
catch (FeatureNotSupportedException)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
if (location is null)
|
||||
{
|
||||
var lastKnown = await Geolocation.Default.GetLastKnownLocationAsync();
|
||||
if (lastKnown is not null && lastKnown.Timestamp >= DateTimeOffset.UtcNow.AddMinutes(-15))
|
||||
{
|
||||
location = lastKnown;
|
||||
}
|
||||
}
|
||||
|
||||
return location is null ? null : ToSnapshot(location);
|
||||
}
|
||||
|
||||
public async Task StartTrackingAsync(Func<LocationSnapshot, Task> onLocation, Func<string, Task> onError)
|
||||
{
|
||||
if (trackingCancellation is not null)
|
||||
@@ -47,14 +78,7 @@ public sealed class PreciseLocationService : IAsyncDisposable
|
||||
var location = await Geolocation.Default.GetLocationAsync(request, token);
|
||||
if (location is not null)
|
||||
{
|
||||
await onLocation(new LocationSnapshot(
|
||||
location.Latitude,
|
||||
location.Longitude,
|
||||
location.Accuracy,
|
||||
location.Altitude,
|
||||
location.Course,
|
||||
location.Speed,
|
||||
location.Timestamp));
|
||||
await onLocation(ToSnapshot(location));
|
||||
}
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
@@ -84,6 +108,15 @@ public sealed class PreciseLocationService : IAsyncDisposable
|
||||
StopTracking();
|
||||
return ValueTask.CompletedTask;
|
||||
}
|
||||
|
||||
private static LocationSnapshot ToSnapshot(Location location) => new(
|
||||
location.Latitude,
|
||||
location.Longitude,
|
||||
location.Accuracy,
|
||||
location.Altitude,
|
||||
location.Course,
|
||||
location.Speed,
|
||||
location.Timestamp);
|
||||
}
|
||||
|
||||
public sealed record LocationSnapshot(
|
||||
|
||||
+220
-3
@@ -239,6 +239,126 @@ input[type="checkbox"] {
|
||||
padding-top: 9px;
|
||||
}
|
||||
|
||||
.layer-tree-section {
|
||||
display: grid;
|
||||
gap: 6px;
|
||||
padding-top: 9px;
|
||||
}
|
||||
|
||||
.layer-tree-section > header {
|
||||
display: grid;
|
||||
gap: 2px;
|
||||
padding: 0 4px;
|
||||
}
|
||||
|
||||
.layer-tree-section > header small {
|
||||
color: var(--muted);
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.layer-manager-tree,
|
||||
.layer-manager-children {
|
||||
display: grid;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.layer-manager-group,
|
||||
.layer-manager-block,
|
||||
.layer-manager-object {
|
||||
border: 1px solid #dce3e6;
|
||||
border-radius: 6px;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.layer-manager-group > summary,
|
||||
.layer-manager-block > summary,
|
||||
.layer-manager-object > summary {
|
||||
display: grid;
|
||||
grid-template-columns: 28px 20px minmax(0, 1fr) auto auto;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
min-height: 38px;
|
||||
padding: 4px 6px;
|
||||
cursor: pointer;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.layer-manager-group > summary::-webkit-details-marker,
|
||||
.layer-manager-block > summary::-webkit-details-marker,
|
||||
.layer-manager-object > summary::-webkit-details-marker {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.layer-drag-handle {
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
border: 0;
|
||||
border-radius: 4px;
|
||||
background: #e9eef0;
|
||||
color: var(--ink);
|
||||
font-size: 18px;
|
||||
line-height: 1;
|
||||
touch-action: none;
|
||||
cursor: grab;
|
||||
}
|
||||
|
||||
.layer-move-buttons {
|
||||
display: inline-grid;
|
||||
grid-template-columns: 24px 24px;
|
||||
gap: 2px;
|
||||
}
|
||||
|
||||
.layer-move-buttons button {
|
||||
width: 24px;
|
||||
height: 28px;
|
||||
padding: 0;
|
||||
border: 1px solid #cbd5da;
|
||||
border-radius: 4px;
|
||||
background: #f6f8f9;
|
||||
color: var(--ink);
|
||||
font-size: 16px;
|
||||
font-weight: 800;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.layer-move-buttons button:active {
|
||||
background: #dce8ec;
|
||||
}
|
||||
|
||||
.layer-manager-title {
|
||||
min-width: 0;
|
||||
overflow-wrap: anywhere;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.layer-manager-count {
|
||||
color: var(--muted);
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.layer-manager-children {
|
||||
padding: 0 5px 5px 18px;
|
||||
}
|
||||
|
||||
.layer-manager-details {
|
||||
display: grid;
|
||||
gap: 2px;
|
||||
padding: 0 8px 7px 40px;
|
||||
color: var(--muted);
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.layer-manager-dragging {
|
||||
opacity: 0.55;
|
||||
outline: 2px solid #2563eb;
|
||||
}
|
||||
|
||||
.layer-manager-object-selected > summary {
|
||||
background: #fff0fb;
|
||||
box-shadow: inset 3px 0 #ff00d4;
|
||||
}
|
||||
|
||||
.gps-overlay {
|
||||
position: absolute;
|
||||
top: 72px;
|
||||
@@ -292,6 +412,20 @@ input[type="checkbox"] {
|
||||
color: var(--ink);
|
||||
}
|
||||
|
||||
.leaflet-top.leaflet-right {
|
||||
top: 68px;
|
||||
right: 2px;
|
||||
}
|
||||
|
||||
.map-stage.search-active .leaflet-top.leaflet-right {
|
||||
top: 136px;
|
||||
}
|
||||
|
||||
.leaflet-touch .leaflet-draw-toolbar a {
|
||||
width: 38px;
|
||||
height: 38px;
|
||||
}
|
||||
|
||||
.tool-sheet {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
@@ -358,6 +492,29 @@ h2 {
|
||||
padding: 15px 16px 24px;
|
||||
}
|
||||
|
||||
.panel-section {
|
||||
display: grid;
|
||||
gap: 12px;
|
||||
padding: 0 0 16px;
|
||||
border-bottom: 1px solid var(--line);
|
||||
}
|
||||
|
||||
.panel-section:last-child {
|
||||
padding-bottom: 0;
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.panel-section h2 {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.field-help {
|
||||
margin-top: -7px;
|
||||
color: var(--muted);
|
||||
font-size: 10px;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
label {
|
||||
display: grid;
|
||||
gap: 5px;
|
||||
@@ -472,6 +629,56 @@ label {
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.measurement-mode-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
gap: 7px;
|
||||
}
|
||||
|
||||
.measurement-mode-grid button {
|
||||
min-width: 0;
|
||||
padding: 0 8px;
|
||||
}
|
||||
|
||||
.lme-measure-label {
|
||||
width: 0 !important;
|
||||
height: 0 !important;
|
||||
border: 0 !important;
|
||||
background: transparent !important;
|
||||
pointer-events: none !important;
|
||||
}
|
||||
|
||||
.lme-measure-label span {
|
||||
position: absolute;
|
||||
transform: translate(-50%, -50%);
|
||||
border: 1px solid rgba(23, 33, 43, 0.35);
|
||||
border-radius: 4px;
|
||||
padding: 2px 5px;
|
||||
background: rgba(255, 255, 255, 0.92);
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.24);
|
||||
color: #17212b;
|
||||
font-size: 10px;
|
||||
font-weight: 800;
|
||||
line-height: 1.25;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.lme-measure-label.imported span {
|
||||
border-color: #15806a;
|
||||
color: #0c5749;
|
||||
}
|
||||
|
||||
.lme-measure-label.drawing span {
|
||||
border-color: #d35d0b;
|
||||
color: #7c2d12;
|
||||
}
|
||||
|
||||
.lme-measure-label.side span {
|
||||
padding: 1px 4px;
|
||||
font-size: 9px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.map-info {
|
||||
position: absolute;
|
||||
left: 12px;
|
||||
@@ -587,7 +794,7 @@ label {
|
||||
left: 0;
|
||||
z-index: 1200;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||
grid-template-columns: repeat(6, minmax(0, 1fr));
|
||||
height: var(--nav-height);
|
||||
padding-bottom: env(safe-area-inset-bottom);
|
||||
border-top: 1px solid #bcc7cd;
|
||||
@@ -688,6 +895,15 @@ footer {
|
||||
top: 136px;
|
||||
}
|
||||
|
||||
.leaflet-top.leaflet-right {
|
||||
top: 122px;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.map-stage.search-active .leaflet-top.leaflet-right {
|
||||
top: 190px;
|
||||
}
|
||||
|
||||
.gps-main,
|
||||
.gps-center {
|
||||
padding: 0 8px;
|
||||
@@ -705,7 +921,8 @@ footer {
|
||||
}
|
||||
|
||||
.bottom-tabs button {
|
||||
font-size: 11px;
|
||||
padding: 0 2px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.wms-preview {
|
||||
@@ -727,6 +944,6 @@ footer {
|
||||
}
|
||||
|
||||
.bottom-tabs button {
|
||||
font-size: 10px;
|
||||
font-size: 9px;
|
||||
}
|
||||
}
|
||||
+1977
-70
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user