Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b19afbce91 | ||
|
|
28a982abed | ||
|
|
0ffcc7ae31 | ||
|
|
bb30f23d67 | ||
|
|
87304b1568 | ||
|
|
a23eff6124 | ||
|
|
4da47a8835 | ||
|
|
fc303e2555 | ||
|
|
49ed7d5f0e | ||
|
|
3856a9f675 | ||
|
|
e1bb7d9320 | ||
|
|
f1bbd53634 | ||
|
|
708f539c64 | ||
|
|
e93dd9b867 | ||
|
|
a9b1d74983 | ||
|
|
c093d88677 | ||
|
|
78af860493 |
No files matched your search
+305
-23
@@ -7,6 +7,7 @@
|
|||||||
@inject NetworkLocationService NetworkLocationService
|
@inject NetworkLocationService NetworkLocationService
|
||||||
@inject AzureMapsService AzureMapsService
|
@inject AzureMapsService AzureMapsService
|
||||||
@inject ProjectStorageService ProjectStorageService
|
@inject ProjectStorageService ProjectStorageService
|
||||||
|
@inject MapExportService MapExportService
|
||||||
@implements IAsyncDisposable
|
@implements IAsyncDisposable
|
||||||
|
|
||||||
<PageTitle>LME Mappe Catastali</PageTitle>
|
<PageTitle>LME Mappe Catastali</PageTitle>
|
||||||
@@ -57,8 +58,29 @@
|
|||||||
</span>
|
</span>
|
||||||
</label>
|
</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">
|
<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>
|
<button class="danger-command" @onclick="ClearMapElements">Pulisci elementi mappa</button>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
@@ -160,7 +182,7 @@
|
|||||||
<input id="gisFileInput" type="file" accept=".kml,.kmz,.geojson,.json,application/vnd.google-earth.kml+xml,application/vnd.google-earth.kmz,application/geo+json" />
|
<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>
|
||||||
<label class="toggle-line project-save-option">
|
<label class="toggle-line project-save-option">
|
||||||
<input type="checkbox" checked="@IncludeKmlSheetLayer" @onchange="ToggleKmlSheetLayer" />
|
<input type="checkbox" @bind="IncludeKmlSheetLayer" @bind:after="ApplyKmlSheetLayerOption" />
|
||||||
<span>KML/KMZ: includi anche il layer del foglio</span>
|
<span>KML/KMZ: includi anche il layer del foglio</span>
|
||||||
</label>
|
</label>
|
||||||
<small class="field-help">
|
<small class="field-help">
|
||||||
@@ -169,12 +191,16 @@
|
|||||||
: "Disattivato: importa solo i poligoni delle particelle riconosciute.")
|
: "Disattivato: importa solo i poligoni delle particelle riconosciute.")
|
||||||
</small>
|
</small>
|
||||||
<label class="toggle-line project-save-option">
|
<label class="toggle-line project-save-option">
|
||||||
<input type="checkbox" checked="@ShowImportedSheetLayer" @onchange="ToggleImportedSheetLayer" />
|
<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>
|
<span>Mostra cornice/layer del foglio importato</span>
|
||||||
</label>
|
</label>
|
||||||
<small class="field-help">La cornice grande resta separata dalle particelle e puo essere nascosta anche nei progetti salvati.</small>
|
<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">
|
<label class="toggle-line project-save-option">
|
||||||
<input type="checkbox" checked="@ShowImportedMeasurements" @onchange="ToggleImportedMeasurements" />
|
<input type="checkbox" @bind="ShowImportedMeasurements" @bind:after="ApplyImportedMeasurementsVisibility" />
|
||||||
<span>Mostra misure dei file caricati</span>
|
<span>Mostra misure dei file caricati</span>
|
||||||
</label>
|
</label>
|
||||||
<div class="button-row">
|
<div class="button-row">
|
||||||
@@ -186,7 +212,7 @@
|
|||||||
<section class="panel-section">
|
<section class="panel-section">
|
||||||
<h2>Disegni e misure</h2>
|
<h2>Disegni e misure</h2>
|
||||||
<label class="toggle-line project-save-option">
|
<label class="toggle-line project-save-option">
|
||||||
<input type="checkbox" checked="@ShowDrawingMeasurements" @onchange="ToggleDrawingMeasurements" />
|
<input type="checkbox" @bind="ShowDrawingMeasurements" @bind:after="ApplyDrawingMeasurementsVisibility" />
|
||||||
<span>Mostra superficie, perimetro e lati</span>
|
<span>Mostra superficie, perimetro e lati</span>
|
||||||
</label>
|
</label>
|
||||||
<button class="secondary-command" aria-pressed="@DrawToolsVisible" @onclick="ToggleDrawTools">
|
<button class="secondary-command" aria-pressed="@DrawToolsVisible" @onclick="ToggleDrawTools">
|
||||||
@@ -205,6 +231,57 @@
|
|||||||
</section>
|
</section>
|
||||||
</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")
|
else if (ActiveTab == "projects")
|
||||||
{
|
{
|
||||||
<section class="panel-content">
|
<section class="panel-content">
|
||||||
@@ -215,7 +292,7 @@
|
|||||||
<input @bind="NewProjectName" @bind:event="oninput" placeholder="Es. Rilievo San Nicola" maxlength="80" />
|
<input @bind="NewProjectName" @bind:event="oninput" placeholder="Es. Rilievo San Nicola" maxlength="80" />
|
||||||
</label>
|
</label>
|
||||||
<label class="toggle-line project-save-option">
|
<label class="toggle-line project-save-option">
|
||||||
<input type="checkbox" @bind="IncludeCadastralParcels" />
|
<input type="checkbox" @bind="IncludeCadastralParcels" @bind:after="SaveFlagPreferences" />
|
||||||
<span>Includi le particelle catastali rosse</span>
|
<span>Includi le particelle catastali rosse</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>
|
||||||
@@ -239,6 +316,27 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="project-archive-state">@ProjectArchiveMessage</div>
|
<div class="project-archive-state">@ProjectArchiveMessage</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<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>
|
</section>
|
||||||
}
|
}
|
||||||
else if (ActiveTab == "settings")
|
else if (ActiveTab == "settings")
|
||||||
@@ -288,11 +386,11 @@
|
|||||||
<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">
|
||||||
<input type="checkbox" checked="@ShowGpsPosition" @onchange="ToggleGpsPosition" />
|
<input type="checkbox" @bind="ShowGpsPosition" @bind:after="ApplyGpsPositionVisibility" />
|
||||||
<span>Mostra punto e cerchio GPS</span>
|
<span>Mostra punto e cerchio GPS</span>
|
||||||
</label>
|
</label>
|
||||||
<label class="toggle-line project-save-option">
|
<label class="toggle-line project-save-option">
|
||||||
<input type="checkbox" checked="@TrailEnabled" @onchange="ToggleTrail" />
|
<input type="checkbox" @bind="TrailEnabled" @bind:after="ApplyTrailOption" />
|
||||||
<span>Registra la traccia mentre cammini</span>
|
<span>Registra la traccia mentre cammini</span>
|
||||||
</label>
|
</label>
|
||||||
</section>
|
</section>
|
||||||
@@ -339,15 +437,19 @@
|
|||||||
<button class="@(ActiveTab == "cadastre" ? "active" : null)" @onclick='() => SelectTab("cadastre")'>Catasto</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 == "data" ? "active" : null)" @onclick='() => SelectTab("data")'>Dati</button>
|
||||||
<button class="@(ActiveTab == "projects" ? "active" : null)" @onclick='() => SelectTab("projects")'>Progetti</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>
|
<button class="@(ActiveTab == "settings" ? "active" : null)" @onclick='() => SelectTab("settings")'>Impostazioni</button>
|
||||||
</nav>
|
</nav>
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
|
private const string FlagPreferencePrefix = "lme_flag_";
|
||||||
private string ActiveTab { get; set; } = "map";
|
private string ActiveTab { get; set; } = "map";
|
||||||
private string SearchText { get; set; } = string.Empty;
|
private string SearchText { get; set; } = string.Empty;
|
||||||
private string NewProjectName { 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 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.";
|
||||||
@@ -365,15 +467,25 @@
|
|||||||
private bool CatalogBusy { get; set; }
|
private bool CatalogBusy { get; set; }
|
||||||
private bool GpsActive { get; set; }
|
private bool GpsActive { get; set; }
|
||||||
private bool ShowGpsPosition { get; set; } = true;
|
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 DrawToolsVisible { get; set; }
|
||||||
private bool TrailEnabled { get; set; }
|
private bool TrailEnabled { get; set; }
|
||||||
private bool LayerPanelOpen { get; set; }
|
private bool LayerPanelOpen { 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; }
|
||||||
private bool ShowImportedMeasurements { get; set; }
|
private bool ShowImportedMeasurements { get; set; }
|
||||||
private bool ShowDrawingMeasurements { get; set; } = true;
|
private bool ShowDrawingMeasurements { get; set; } = true;
|
||||||
private bool ProjectBusy { get; set; }
|
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? CatalogCancellation { get; set; }
|
||||||
private CancellationTokenSource? GpsLookupCancellation { get; set; }
|
private CancellationTokenSource? GpsLookupCancellation { get; set; }
|
||||||
private long LastGpsLookupAt;
|
private long LastGpsLookupAt;
|
||||||
@@ -396,6 +508,7 @@
|
|||||||
"cadastre" => "Ricerca catastale",
|
"cadastre" => "Ricerca catastale",
|
||||||
"data" => "Dati e disegni",
|
"data" => "Dati e disegni",
|
||||||
"projects" => "Archivio progetti",
|
"projects" => "Archivio progetti",
|
||||||
|
"save" => "Salvataggio ed esportazione",
|
||||||
"settings" => "Impostazioni",
|
"settings" => "Impostazioni",
|
||||||
_ => string.Empty
|
_ => string.Empty
|
||||||
};
|
};
|
||||||
@@ -404,7 +517,8 @@
|
|||||||
{
|
{
|
||||||
"cadastre" => "Regione, Comune, Foglio, Particella",
|
"cadastre" => "Regione, Comune, Foglio, Particella",
|
||||||
"data" => "File GIS, misure e POI",
|
"data" => "File GIS, misure e POI",
|
||||||
"projects" => "Salva e apri i tuoi lavori",
|
"projects" => "Salva, apri e visualizza i tuoi lavori",
|
||||||
|
"save" => "Esporta file GIS",
|
||||||
"settings" => "Mappa, GPS e servizi ufficiali",
|
"settings" => "Mappa, GPS e servizi ufficiali",
|
||||||
_ => string.Empty
|
_ => string.Empty
|
||||||
};
|
};
|
||||||
@@ -421,6 +535,8 @@
|
|||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
|
LoadFlagPreferences();
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
GoogleMapsApiKey = await SecureStorage.Default.GetAsync("google_maps_api_key") ?? string.Empty;
|
GoogleMapsApiKey = await SecureStorage.Default.GetAsync("google_maps_api_key") ?? string.Empty;
|
||||||
@@ -455,7 +571,9 @@
|
|||||||
{
|
{
|
||||||
if (firstRender)
|
if (firstRender)
|
||||||
{
|
{
|
||||||
await JS.InvokeVoidAsync("lmeMap.init");
|
MapCallbackReference = DotNetObjectReference.Create(this);
|
||||||
|
await JS.InvokeVoidAsync("lmeMap.init", MapCallbackReference);
|
||||||
|
await ApplyFlagPreferencesToMapAsync();
|
||||||
await CenterOnInitialLocationAsync();
|
await CenterOnInitialLocationAsync();
|
||||||
await MigrateLegacyProjectAsync();
|
await MigrateLegacyProjectAsync();
|
||||||
}
|
}
|
||||||
@@ -588,11 +706,19 @@
|
|||||||
}
|
}
|
||||||
await Task.Delay(30);
|
await Task.Delay(30);
|
||||||
await JS.InvokeVoidAsync("lmeMap.resize");
|
await JS.InvokeVoidAsync("lmeMap.resize");
|
||||||
|
if (LayerPanelOpen)
|
||||||
|
{
|
||||||
|
await JS.InvokeVoidAsync("lmeMap.refreshLayerManager");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task ToggleLayerPanel()
|
private async Task ToggleLayerPanel()
|
||||||
{
|
{
|
||||||
LayerPanelOpen = !LayerPanelOpen;
|
LayerPanelOpen = !LayerPanelOpen;
|
||||||
|
if (!LayerPanelOpen)
|
||||||
|
{
|
||||||
|
await JS.InvokeVoidAsync("lmeMap.clearLayerManagerSelection");
|
||||||
|
}
|
||||||
if (LayerPanelOpen)
|
if (LayerPanelOpen)
|
||||||
{
|
{
|
||||||
ActiveTab = "map";
|
ActiveTab = "map";
|
||||||
@@ -600,6 +726,10 @@
|
|||||||
|
|
||||||
await Task.Delay(30);
|
await Task.Delay(30);
|
||||||
await JS.InvokeVoidAsync("lmeMap.resize");
|
await JS.InvokeVoidAsync("lmeMap.resize");
|
||||||
|
if (LayerPanelOpen)
|
||||||
|
{
|
||||||
|
await JS.InvokeVoidAsync("lmeMap.refreshLayerManager");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task SearchLocation()
|
private async Task SearchLocation()
|
||||||
@@ -773,9 +903,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task ToggleGpsPosition(ChangeEventArgs args)
|
private async Task ApplyGpsPositionVisibility()
|
||||||
{
|
{
|
||||||
ShowGpsPosition = (bool?)args.Value == true;
|
SaveFlagPreferences();
|
||||||
await JS.InvokeVoidAsync("lmeMap.setGpsPositionVisible", ShowGpsPosition);
|
await JS.InvokeVoidAsync("lmeMap.setGpsPositionVisible", ShowGpsPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -888,39 +1018,56 @@
|
|||||||
private async Task ClearImportedLayers()
|
private async Task ClearImportedLayers()
|
||||||
{
|
{
|
||||||
ShowImportedSheetLayer = false;
|
ShowImportedSheetLayer = false;
|
||||||
|
SaveFlagPreferences();
|
||||||
await JS.InvokeVoidAsync("lmeMap.clearImported");
|
await JS.InvokeVoidAsync("lmeMap.clearImported");
|
||||||
}
|
}
|
||||||
private Task AddProjectMarker() => JS.InvokeVoidAsync("lmeMap.addProjectMarker", PoiName).AsTask();
|
private Task AddProjectMarker() => JS.InvokeVoidAsync("lmeMap.addProjectMarker", PoiName).AsTask();
|
||||||
|
|
||||||
private async Task ToggleKmlSheetLayer(ChangeEventArgs args)
|
private async Task ApplyKmlSheetLayerOption()
|
||||||
{
|
{
|
||||||
IncludeKmlSheetLayer = (bool?)args.Value == true;
|
|
||||||
ShowImportedSheetLayer = IncludeKmlSheetLayer;
|
ShowImportedSheetLayer = IncludeKmlSheetLayer;
|
||||||
|
SaveFlagPreferences();
|
||||||
await JS.InvokeVoidAsync("lmeMap.setIncludeKmlSheetLayer", IncludeKmlSheetLayer);
|
await JS.InvokeVoidAsync("lmeMap.setIncludeKmlSheetLayer", IncludeKmlSheetLayer);
|
||||||
await JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer);
|
await JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task ToggleImportedSheetLayer(ChangeEventArgs args)
|
private Task ApplyImportedSheetLayerVisibility()
|
||||||
{
|
{
|
||||||
ShowImportedSheetLayer = (bool?)args.Value == true;
|
SaveFlagPreferences();
|
||||||
await JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer);
|
return JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer).AsTask();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task ToggleImportedMeasurements(ChangeEventArgs args)
|
private async Task ApplyImportedMeasurementsVisibility()
|
||||||
{
|
{
|
||||||
ShowImportedMeasurements = (bool?)args.Value == true;
|
SaveFlagPreferences();
|
||||||
await JS.InvokeVoidAsync("lmeMap.setImportedMeasurementsVisible", ShowImportedMeasurements);
|
await JS.InvokeVoidAsync("lmeMap.setImportedMeasurementsVisible", ShowImportedMeasurements);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task ToggleDrawingMeasurements(ChangeEventArgs args)
|
private async Task ApplyDrawingMeasurementsVisibility()
|
||||||
{
|
{
|
||||||
ShowDrawingMeasurements = (bool?)args.Value == true;
|
SaveFlagPreferences();
|
||||||
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);
|
||||||
|
}
|
||||||
|
|
||||||
private async Task ToggleDrawTools()
|
private async Task ToggleDrawTools()
|
||||||
{
|
{
|
||||||
DrawToolsVisible = !DrawToolsVisible;
|
DrawToolsVisible = !DrawToolsVisible;
|
||||||
|
SaveFlagPreferences();
|
||||||
await JS.InvokeVoidAsync("lmeMap.setDrawToolsVisible", DrawToolsVisible);
|
await JS.InvokeVoidAsync("lmeMap.setDrawToolsVisible", DrawToolsVisible);
|
||||||
|
|
||||||
if (DrawToolsVisible)
|
if (DrawToolsVisible)
|
||||||
@@ -956,6 +1103,47 @@
|
|||||||
return Task.CompletedTask;
|
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()
|
private async Task SaveProject()
|
||||||
{
|
{
|
||||||
var name = NewProjectName.Trim();
|
var name = NewProjectName.Trim();
|
||||||
@@ -1018,6 +1206,7 @@
|
|||||||
var displayOptions = await JS.InvokeAsync<ProjectDisplayOptions>("lmeMap.loadProjectSnapshot", snapshot, project.Name);
|
var displayOptions = await JS.InvokeAsync<ProjectDisplayOptions>("lmeMap.loadProjectSnapshot", snapshot, project.Name);
|
||||||
ApplyProjectDisplayOptions(displayOptions);
|
ApplyProjectDisplayOptions(displayOptions);
|
||||||
NewProjectName = project.Name;
|
NewProjectName = project.Name;
|
||||||
|
ExportFileName = project.Name;
|
||||||
IncludeCadastralParcels = project.IncludesCadastralParcels;
|
IncludeCadastralParcels = project.IncludesCadastralParcels;
|
||||||
ActiveTab = "map";
|
ActiveTab = "map";
|
||||||
await Task.Delay(30);
|
await Task.Delay(30);
|
||||||
@@ -1038,11 +1227,13 @@
|
|||||||
SelectedBaseLayer = options.BaseLayer;
|
SelectedBaseLayer = options.BaseLayer;
|
||||||
CadastralOpacity = options.CadastreOpacity;
|
CadastralOpacity = options.CadastreOpacity;
|
||||||
IncludeKmlSheetLayer = options.IncludeKmlSheetLayer;
|
IncludeKmlSheetLayer = options.IncludeKmlSheetLayer;
|
||||||
|
ShowImportedData = options.ImportedVisible;
|
||||||
ShowImportedSheetLayer = options.ImportedSheetsVisible;
|
ShowImportedSheetLayer = options.ImportedSheetsVisible;
|
||||||
ShowImportedMeasurements = options.ShowImportedMeasurements;
|
ShowImportedMeasurements = options.ShowImportedMeasurements;
|
||||||
ShowDrawingMeasurements = options.ShowDrawingMeasurements;
|
ShowDrawingMeasurements = options.ShowDrawingMeasurements;
|
||||||
DrawToolsVisible = options.DrawToolsVisible;
|
DrawToolsVisible = options.DrawToolsVisible;
|
||||||
ShowGpsPosition = options.GpsPositionVisible;
|
ShowGpsPosition = options.GpsPositionVisible;
|
||||||
|
ShowSelectedParcels = options.SelectedParcelsVisible;
|
||||||
TrailEnabled = options.TrailEnabled;
|
TrailEnabled = options.TrailEnabled;
|
||||||
|
|
||||||
var activeLayers = (options.CadastreLayers ?? []).ToHashSet(StringComparer.Ordinal);
|
var activeLayers = (options.CadastreLayers ?? []).ToHashSet(StringComparer.Ordinal);
|
||||||
@@ -1050,6 +1241,7 @@
|
|||||||
{
|
{
|
||||||
layer.Enabled = activeLayers.Contains(layer.Key);
|
layer.Enabled = activeLayers.Contains(layer.Key);
|
||||||
}
|
}
|
||||||
|
SaveFlagPreferences();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task DeleteProject()
|
private async Task DeleteProject()
|
||||||
@@ -1082,9 +1274,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
private Task CenterOnGps() => JS.InvokeVoidAsync("lmeMap.centerOnGps").AsTask();
|
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);
|
await JS.InvokeVoidAsync("lmeMap.toggleTrail", TrailEnabled);
|
||||||
}
|
}
|
||||||
private async Task ChangeBaseLayer(ChangeEventArgs args)
|
private async Task ChangeBaseLayer(ChangeEventArgs args)
|
||||||
@@ -1189,9 +1381,96 @@
|
|||||||
private async Task ToggleCadastreLayer(CadastralLayer layer, ChangeEventArgs args)
|
private async Task ToggleCadastreLayer(CadastralLayer layer, ChangeEventArgs args)
|
||||||
{
|
{
|
||||||
layer.Enabled = args.Value is true;
|
layer.Enabled = args.Value is true;
|
||||||
|
SaveFlagPreferences();
|
||||||
await JS.InvokeVoidAsync("lmeMap.toggleCadastreLayer", layer.Key, layer.Enabled);
|
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()
|
private async Task ExportCadastralImage()
|
||||||
{
|
{
|
||||||
ActiveTab = "map";
|
ActiveTab = "map";
|
||||||
@@ -1225,11 +1504,13 @@
|
|||||||
public double CadastreOpacity { get; init; } = 0.75;
|
public double CadastreOpacity { get; init; } = 0.75;
|
||||||
public string[] CadastreLayers { get; init; } = [];
|
public string[] CadastreLayers { get; init; } = [];
|
||||||
public bool IncludeKmlSheetLayer { get; init; }
|
public bool IncludeKmlSheetLayer { get; init; }
|
||||||
|
public bool ImportedVisible { get; init; } = true;
|
||||||
public bool ImportedSheetsVisible { get; init; }
|
public bool ImportedSheetsVisible { get; init; }
|
||||||
public bool ShowImportedMeasurements { get; init; }
|
public bool ShowImportedMeasurements { get; init; }
|
||||||
public bool ShowDrawingMeasurements { get; init; } = true;
|
public bool ShowDrawingMeasurements { get; init; } = true;
|
||||||
public bool DrawToolsVisible { get; init; }
|
public bool DrawToolsVisible { get; init; }
|
||||||
public bool GpsPositionVisible { get; init; } = true;
|
public bool GpsPositionVisible { get; init; } = true;
|
||||||
|
public bool SelectedParcelsVisible { get; init; } = true;
|
||||||
public bool TrailEnabled { get; init; }
|
public bool TrailEnabled { get; init; }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1239,6 +1520,7 @@
|
|||||||
LocationService.StopTracking();
|
LocationService.StopTracking();
|
||||||
GpsLookupCancellation?.Cancel();
|
GpsLookupCancellation?.Cancel();
|
||||||
GpsLookupCancellation?.Dispose();
|
GpsLookupCancellation?.Dispose();
|
||||||
|
MapCallbackReference?.Dispose();
|
||||||
return ValueTask.CompletedTask;
|
return ValueTask.CompletedTask;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -28,8 +28,8 @@
|
|||||||
<ApplicationId>com.companyname.lmemappecatastaliapp</ApplicationId>
|
<ApplicationId>com.companyname.lmemappecatastaliapp</ApplicationId>
|
||||||
|
|
||||||
<!-- Versions -->
|
<!-- Versions -->
|
||||||
<ApplicationDisplayVersion>0.2.12</ApplicationDisplayVersion>
|
<ApplicationDisplayVersion>0.2.29</ApplicationDisplayVersion>
|
||||||
<ApplicationVersion>16</ApplicationVersion>
|
<ApplicationVersion>33</ApplicationVersion>
|
||||||
|
|
||||||
<!-- 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>
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- App Icon -->
|
<!-- 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 -->
|
<!-- Splash Screen -->
|
||||||
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
|
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ public static class MauiProgram
|
|||||||
builder.Services.AddSingleton<NetworkLocationService>();
|
builder.Services.AddSingleton<NetworkLocationService>();
|
||||||
builder.Services.AddSingleton<AzureMapsService>();
|
builder.Services.AddSingleton<AzureMapsService>();
|
||||||
builder.Services.AddSingleton<ProjectStorageService>();
|
builder.Services.AddSingleton<ProjectStorageService>();
|
||||||
|
builder.Services.AddSingleton<MapExportService>();
|
||||||
|
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
builder.Services.AddBlazorWebViewDeveloperTools();
|
builder.Services.AddBlazorWebViewDeveloperTools();
|
||||||
|
|||||||
@@ -11,12 +11,14 @@ App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata pe
|
|||||||
- Import di file KML, KMZ, GeoJSON e JSON.
|
- Import di file KML, KMZ, GeoJSON e JSON.
|
||||||
- Import GeoJSON compatibile con BOM, geometrie singole, array, FeatureCollection e coordinate Web Mercator EPSG:3857.
|
- 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.
|
- 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.
|
- 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 dal pulsante nel tab Dati 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.
|
||||||
- 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.
|
||||||
@@ -24,7 +26,7 @@ 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, 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".
|
- 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.
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
<svg width="456" height="456" viewBox="0 0 456 456" xmlns="http://www.w3.org/2000/svg">
|
||||||
<rect x="0" y="0" width="456" height="456" fill="#512BD4" />
|
<rect width="456" height="456" fill="#075E54" />
|
||||||
</svg>
|
</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"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!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" xmlns="http://www.w3.org/2000/svg">
|
||||||
<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;">
|
<g stroke-linecap="round" stroke-linejoin="round">
|
||||||
<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="M105 150L183 119L273 151L351 120V307L273 338L183 306L105 337Z"
|
||||||
<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" />
|
fill="#F7FAF5" stroke="#E1ECE5" stroke-width="10" />
|
||||||
<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="M183 119V306M273 151V338" fill="none" stroke="#83B6A5" stroke-width="10" />
|
||||||
<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" />
|
<path d="M125 190L162 175M124 274L160 260M293 196L330 181M295 282L330 268"
|
||||||
</svg>
|
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()
|
public AzureMapsService()
|
||||||
{
|
{
|
||||||
_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.12");
|
_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
|
||||||
_httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/json");
|
_httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/json");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,257 @@
|
|||||||
|
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"));
|
||||||
|
var categoryFolders = new Dictionary<string, XElement>(StringComparer.Ordinal);
|
||||||
|
var groupFolders = new Dictionary<(string Category, string Group), XElement>();
|
||||||
|
|
||||||
|
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));
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
@@ -13,7 +13,7 @@ public sealed class NetworkLocationService
|
|||||||
|
|
||||||
public NetworkLocationService()
|
public NetworkLocationService()
|
||||||
{
|
{
|
||||||
httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.12");
|
httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<NetworkLocationSnapshot?> GetApproximateLocationAsync(
|
public async Task<NetworkLocationSnapshot?> GetApproximateLocationAsync(
|
||||||
|
|||||||
+282
-7
@@ -176,10 +176,11 @@ input[type="checkbox"] {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 72px;
|
top: 72px;
|
||||||
right: 12px;
|
right: 12px;
|
||||||
|
bottom: calc(var(--nav-height) + 8px);
|
||||||
z-index: 940;
|
z-index: 940;
|
||||||
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 +240,274 @@ input[type="checkbox"] {
|
|||||||
padding-top: 9px;
|
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 var(--layer-group-border, #dce3e6);
|
||||||
|
border-radius: 6px;
|
||||||
|
background: var(--layer-group-surface, #fff);
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-group > summary,
|
||||||
|
.layer-manager-block > summary {
|
||||||
|
background: var(--layer-group-parent, #f6f8f9);
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-object > summary {
|
||||||
|
background: var(--layer-group-surface, #fff);
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-group > summary,
|
||||||
|
.layer-manager-block > summary,
|
||||||
|
.layer-manager-object > summary {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 28px minmax(0, 1fr) 50px;
|
||||||
|
grid-template-areas:
|
||||||
|
"handle title count"
|
||||||
|
". visibility moves"
|
||||||
|
". actions moves";
|
||||||
|
align-items: start;
|
||||||
|
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 {
|
||||||
|
grid-area: 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-row-actions {
|
||||||
|
grid-area: actions;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr);
|
||||||
|
width: min(130px, 100%);
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.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-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-remove-button {
|
||||||
|
border-color: #fecaca;
|
||||||
|
background: #fff1f2;
|
||||||
|
color: #b42318;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-remove-button:active {
|
||||||
|
background: #ffe4e6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-move-buttons {
|
||||||
|
grid-area: moves;
|
||||||
|
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 {
|
||||||
|
grid-area: title;
|
||||||
|
min-width: 0;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
|
color: var(--layer-group-accent, var(--ink));
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.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-manager-count {
|
||||||
|
grid-area: count;
|
||||||
|
justify-self: end;
|
||||||
|
color: var(--muted);
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-children {
|
||||||
|
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 minmax(0, 1fr) 46px;
|
||||||
|
gap: 4px;
|
||||||
|
padding: 3px 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.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-remove-button {
|
||||||
|
min-height: 24px;
|
||||||
|
font-size: 9px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-details {
|
||||||
|
display: grid;
|
||||||
|
gap: 2px;
|
||||||
|
padding: 0 6px 7px 12px;
|
||||||
|
color: var(--muted);
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-suboption {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 18px minmax(0, 1fr);
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
min-height: 30px;
|
||||||
|
color: var(--ink);
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-suboption input {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-info {
|
||||||
|
display: grid;
|
||||||
|
gap: 2px;
|
||||||
|
padding: 3px 0 0 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-dragging {
|
||||||
|
opacity: 0.55;
|
||||||
|
outline: 2px solid #2563eb;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-object-selected > summary {
|
||||||
|
background: #fff0fb;
|
||||||
|
box-shadow: inset 3px 0 #ff00d4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layer-manager-parent-highlighted > summary,
|
||||||
|
.layer-manager-parent-selected > summary {
|
||||||
|
background: #fff0fb;
|
||||||
|
box-shadow: inset 3px 0 #ff00d4;
|
||||||
|
}
|
||||||
|
|
||||||
.gps-overlay {
|
.gps-overlay {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 72px;
|
top: 72px;
|
||||||
@@ -306,6 +575,11 @@ 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;
|
||||||
@@ -674,7 +948,7 @@ label {
|
|||||||
left: 0;
|
left: 0;
|
||||||
z-index: 1200;
|
z-index: 1200;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(5, minmax(0, 1fr));
|
grid-template-columns: repeat(6, minmax(0, 1fr));
|
||||||
height: var(--nav-height);
|
height: var(--nav-height);
|
||||||
padding-bottom: env(safe-area-inset-bottom);
|
padding-bottom: env(safe-area-inset-bottom);
|
||||||
border-top: 1px solid #bcc7cd;
|
border-top: 1px solid #bcc7cd;
|
||||||
@@ -748,8 +1022,8 @@ footer {
|
|||||||
.map-layer-panel {
|
.map-layer-panel {
|
||||||
top: 68px;
|
top: 68px;
|
||||||
right: 8px;
|
right: 8px;
|
||||||
width: min(320px, calc(100% - 16px));
|
bottom: calc(var(--nav-height) + 8px);
|
||||||
max-height: calc(100% - 144px);
|
width: 50vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tool-sheet {
|
.tool-sheet {
|
||||||
@@ -801,7 +1075,8 @@ footer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.bottom-tabs button {
|
.bottom-tabs button {
|
||||||
font-size: 11px;
|
padding: 0 2px;
|
||||||
|
font-size: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wms-preview {
|
.wms-preview {
|
||||||
@@ -823,6 +1098,6 @@ footer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.bottom-tabs button {
|
.bottom-tabs button {
|
||||||
font-size: 10px;
|
font-size: 9px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1827
-89
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user