Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
87304b1568 | ||
|
|
a23eff6124 | ||
|
|
4da47a8835 | ||
|
|
fc303e2555 | ||
|
|
49ed7d5f0e | ||
|
|
3856a9f675 | ||
|
|
e1bb7d9320 | ||
|
|
f1bbd53634 | ||
|
|
708f539c64 | ||
|
|
e93dd9b867 |
No files matched your search
+190
-31
@@ -58,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>
|
||||
@@ -161,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" />
|
||||
</label>
|
||||
<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>
|
||||
</label>
|
||||
<small class="field-help">
|
||||
@@ -170,12 +191,16 @@
|
||||
: "Disattivato: importa solo i poligoni delle particelle riconosciute.")
|
||||
</small>
|
||||
<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>
|
||||
</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" checked="@ShowImportedMeasurements" @onchange="ToggleImportedMeasurements" />
|
||||
<input type="checkbox" @bind="ShowImportedMeasurements" @bind:after="ApplyImportedMeasurementsVisibility" />
|
||||
<span>Mostra misure dei file caricati</span>
|
||||
</label>
|
||||
<div class="button-row">
|
||||
@@ -187,7 +212,7 @@
|
||||
<section class="panel-section">
|
||||
<h2>Disegni e misure</h2>
|
||||
<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>
|
||||
</label>
|
||||
<button class="secondary-command" aria-pressed="@DrawToolsVisible" @onclick="ToggleDrawTools">
|
||||
@@ -225,27 +250,27 @@
|
||||
</label>
|
||||
<div class="export-options" role="group" aria-label="Oggetti da esportare">
|
||||
<label class="toggle-line project-save-option">
|
||||
<input type="checkbox" @bind="ExportImported" />
|
||||
<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" />
|
||||
<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" />
|
||||
<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" />
|
||||
<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" />
|
||||
<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" />
|
||||
<input type="checkbox" @bind="ExportTrail" @bind:after="SaveFlagPreferences" />
|
||||
<span>Traccia GPS registrata</span>
|
||||
</label>
|
||||
</div>
|
||||
@@ -267,7 +292,7 @@
|
||||
<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" />
|
||||
<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>
|
||||
@@ -295,16 +320,20 @@
|
||||
<section class="panel-section">
|
||||
<h2>Visualizzazione progetto</h2>
|
||||
<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>
|
||||
</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" checked="@ShowImportedMeasurements" @onchange="ToggleImportedMeasurements" />
|
||||
<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" checked="@ShowDrawingMeasurements" @onchange="ToggleDrawingMeasurements" />
|
||||
<input type="checkbox" @bind="ShowDrawingMeasurements" @bind:after="ApplyDrawingMeasurementsVisibility" />
|
||||
<span>Mostra misure dei disegni</span>
|
||||
</label>
|
||||
</section>
|
||||
@@ -357,11 +386,11 @@
|
||||
<section class="panel-section">
|
||||
<h2>GPS e percorso</h2>
|
||||
<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>
|
||||
</label>
|
||||
<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>
|
||||
</label>
|
||||
</section>
|
||||
@@ -415,6 +444,7 @@
|
||||
</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;
|
||||
@@ -437,9 +467,12 @@
|
||||
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 DotNetObjectReference<Home>? MapCallbackReference { get; set; }
|
||||
private bool IncludeCadastralParcels { get; set; } = true;
|
||||
private bool IncludeKmlSheetLayer { get; set; }
|
||||
private bool ShowImportedSheetLayer { get; set; }
|
||||
@@ -502,6 +535,8 @@
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
LoadFlagPreferences();
|
||||
|
||||
try
|
||||
{
|
||||
GoogleMapsApiKey = await SecureStorage.Default.GetAsync("google_maps_api_key") ?? string.Empty;
|
||||
@@ -536,7 +571,9 @@
|
||||
{
|
||||
if (firstRender)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.init");
|
||||
MapCallbackReference = DotNetObjectReference.Create(this);
|
||||
await JS.InvokeVoidAsync("lmeMap.init", MapCallbackReference);
|
||||
await ApplyFlagPreferencesToMapAsync();
|
||||
await CenterOnInitialLocationAsync();
|
||||
await MigrateLegacyProjectAsync();
|
||||
}
|
||||
@@ -669,11 +706,19 @@
|
||||
}
|
||||
await Task.Delay(30);
|
||||
await JS.InvokeVoidAsync("lmeMap.resize");
|
||||
if (LayerPanelOpen)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.refreshLayerManager");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ToggleLayerPanel()
|
||||
{
|
||||
LayerPanelOpen = !LayerPanelOpen;
|
||||
if (!LayerPanelOpen)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.clearLayerManagerSelection");
|
||||
}
|
||||
if (LayerPanelOpen)
|
||||
{
|
||||
ActiveTab = "map";
|
||||
@@ -681,6 +726,10 @@
|
||||
|
||||
await Task.Delay(30);
|
||||
await JS.InvokeVoidAsync("lmeMap.resize");
|
||||
if (LayerPanelOpen)
|
||||
{
|
||||
await JS.InvokeVoidAsync("lmeMap.refreshLayerManager");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task SearchLocation()
|
||||
@@ -854,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);
|
||||
}
|
||||
|
||||
@@ -969,39 +1018,56 @@
|
||||
private async Task ClearImportedLayers()
|
||||
{
|
||||
ShowImportedSheetLayer = false;
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.clearImported");
|
||||
}
|
||||
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;
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.setIncludeKmlSheetLayer", IncludeKmlSheetLayer);
|
||||
await JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer);
|
||||
}
|
||||
|
||||
private async Task ToggleImportedSheetLayer(ChangeEventArgs args)
|
||||
private Task ApplyImportedSheetLayerVisibility()
|
||||
{
|
||||
ShowImportedSheetLayer = (bool?)args.Value == true;
|
||||
await JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer);
|
||||
SaveFlagPreferences();
|
||||
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);
|
||||
}
|
||||
|
||||
private async Task ToggleDrawingMeasurements(ChangeEventArgs args)
|
||||
private async Task ApplyDrawingMeasurementsVisibility()
|
||||
{
|
||||
ShowDrawingMeasurements = (bool?)args.Value == true;
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.setDrawingMeasurementsVisible", ShowDrawingMeasurements);
|
||||
}
|
||||
|
||||
[JSInvokable]
|
||||
public Task SetMeasurementsFromLayerManager(string category, bool enabled)
|
||||
{
|
||||
if (category == "imported")
|
||||
{
|
||||
ShowImportedMeasurements = enabled;
|
||||
}
|
||||
else if (category == "drawings")
|
||||
{
|
||||
ShowDrawingMeasurements = enabled;
|
||||
}
|
||||
SaveFlagPreferences();
|
||||
return InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private async Task ToggleDrawTools()
|
||||
{
|
||||
DrawToolsVisible = !DrawToolsVisible;
|
||||
SaveFlagPreferences();
|
||||
await JS.InvokeVoidAsync("lmeMap.setDrawToolsVisible", DrawToolsVisible);
|
||||
|
||||
if (DrawToolsVisible)
|
||||
@@ -1161,11 +1227,13 @@
|
||||
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);
|
||||
@@ -1173,6 +1241,7 @@
|
||||
{
|
||||
layer.Enabled = activeLayers.Contains(layer.Key);
|
||||
}
|
||||
SaveFlagPreferences();
|
||||
}
|
||||
|
||||
private async Task DeleteProject()
|
||||
@@ -1205,9 +1274,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)
|
||||
@@ -1312,9 +1381,96 @@
|
||||
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";
|
||||
@@ -1348,11 +1504,13 @@
|
||||
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; }
|
||||
}
|
||||
|
||||
@@ -1362,6 +1520,7 @@
|
||||
LocationService.StopTracking();
|
||||
GpsLookupCancellation?.Cancel();
|
||||
GpsLookupCancellation?.Dispose();
|
||||
MapCallbackReference?.Dispose();
|
||||
return ValueTask.CompletedTask;
|
||||
}
|
||||
}
|
||||
@@ -28,8 +28,8 @@
|
||||
<ApplicationId>com.companyname.lmemappecatastaliapp</ApplicationId>
|
||||
|
||||
<!-- Versions -->
|
||||
<ApplicationDisplayVersion>0.2.15</ApplicationDisplayVersion>
|
||||
<ApplicationVersion>19</ApplicationVersion>
|
||||
<ApplicationDisplayVersion>0.2.25</ApplicationDisplayVersion>
|
||||
<ApplicationVersion>29</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" />
|
||||
|
||||
@@ -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.15");
|
||||
_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
|
||||
_httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/json");
|
||||
}
|
||||
|
||||
|
||||
@@ -78,6 +78,8 @@ public sealed class MapExportService
|
||||
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())
|
||||
{
|
||||
@@ -102,7 +104,31 @@ public sealed class MapExportService
|
||||
placemark.Add(extendedData);
|
||||
}
|
||||
placemark.Add(BuildGeometry(geometry));
|
||||
document.Add(placemark);
|
||||
var categoryName = GetString(properties, "_lmeCategoryName")?.Trim();
|
||||
var groupName = GetString(properties, "_lmeGroupName")?.Trim();
|
||||
var parent = document;
|
||||
if (!string.IsNullOrWhiteSpace(categoryName))
|
||||
{
|
||||
if (!categoryFolders.TryGetValue(categoryName, out var categoryFolder))
|
||||
{
|
||||
categoryFolder = new XElement(Kml + "Folder", new XElement(Kml + "name", categoryName));
|
||||
categoryFolders[categoryName] = categoryFolder;
|
||||
document.Add(categoryFolder);
|
||||
}
|
||||
parent = categoryFolder;
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(groupName))
|
||||
{
|
||||
var key = (categoryName ?? string.Empty, groupName);
|
||||
if (!groupFolders.TryGetValue(key, out var groupFolder))
|
||||
{
|
||||
groupFolder = new XElement(Kml + "Folder", new XElement(Kml + "name", groupName));
|
||||
groupFolders[key] = groupFolder;
|
||||
parent.Add(groupFolder);
|
||||
}
|
||||
parent = groupFolder;
|
||||
}
|
||||
parent.Add(placemark);
|
||||
}
|
||||
|
||||
return new XDocument(new XDeclaration("1.0", "utf-8", null), new XElement(Kml + "kml", document)).ToString();
|
||||
|
||||
@@ -13,7 +13,7 @@ public sealed class NetworkLocationService
|
||||
|
||||
public NetworkLocationService()
|
||||
{
|
||||
httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.15");
|
||||
httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
|
||||
}
|
||||
|
||||
public async Task<NetworkLocationSnapshot?> GetApproximateLocationAsync(
|
||||
|
||||
+213
-2
@@ -178,7 +178,7 @@ input[type="checkbox"] {
|
||||
right: 12px;
|
||||
z-index: 940;
|
||||
display: grid;
|
||||
width: min(320px, calc(100% - 24px));
|
||||
width: min(760px, 62vw, calc(100% - 24px));
|
||||
max-height: calc(100% - 152px);
|
||||
overflow-y: auto;
|
||||
border: 1px solid var(--line);
|
||||
@@ -239,6 +239,190 @@ 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-with-actions > summary {
|
||||
grid-template-columns: 28px 20px minmax(0, 1fr) auto auto auto;
|
||||
}
|
||||
|
||||
.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-row-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-end;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.layer-rename-button,
|
||||
.layer-remove-button {
|
||||
min-height: 28px;
|
||||
padding: 0 8px;
|
||||
border: 1px solid #bfd4cd;
|
||||
border-radius: 4px;
|
||||
background: #eef8f5;
|
||||
color: var(--accent-strong);
|
||||
font-size: 10px;
|
||||
font-weight: 800;
|
||||
}
|
||||
|
||||
.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 {
|
||||
display: inline-grid;
|
||||
grid-template-columns: 24px 24px;
|
||||
gap: 2px;
|
||||
}
|
||||
|
||||
.layer-move-buttons button {
|
||||
width: 24px;
|
||||
height: 28px;
|
||||
padding: 0;
|
||||
border: 1px solid #cbd5da;
|
||||
border-radius: 4px;
|
||||
background: #f6f8f9;
|
||||
color: var(--ink);
|
||||
font-size: 16px;
|
||||
font-weight: 800;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.layer-move-buttons button:active {
|
||||
background: #dce8ec;
|
||||
}
|
||||
|
||||
.layer-manager-title {
|
||||
min-width: 0;
|
||||
overflow-wrap: anywhere;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.layer-manager-count {
|
||||
color: var(--muted);
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.layer-manager-children {
|
||||
padding: 0 5px 5px 18px;
|
||||
}
|
||||
|
||||
.layer-manager-details {
|
||||
display: grid;
|
||||
gap: 2px;
|
||||
padding: 0 8px 7px 40px;
|
||||
color: var(--muted);
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.layer-manager-suboption {
|
||||
display: grid;
|
||||
grid-template-columns: 18px minmax(0, 1fr);
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
min-height: 30px;
|
||||
color: var(--ink);
|
||||
font-size: 11px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.layer-manager-suboption input {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.layer-manager-info {
|
||||
display: grid;
|
||||
gap: 2px;
|
||||
padding: 3px 0 0 24px;
|
||||
}
|
||||
|
||||
.layer-manager-dragging {
|
||||
opacity: 0.55;
|
||||
outline: 2px solid #2563eb;
|
||||
}
|
||||
|
||||
.layer-manager-object-selected > summary {
|
||||
background: #fff0fb;
|
||||
box-shadow: inset 3px 0 #ff00d4;
|
||||
}
|
||||
|
||||
.layer-manager-parent-highlighted > summary,
|
||||
.layer-manager-parent-selected > summary {
|
||||
background: #fff0fb;
|
||||
box-shadow: inset 3px 0 #ff00d4;
|
||||
}
|
||||
|
||||
.gps-overlay {
|
||||
position: absolute;
|
||||
top: 72px;
|
||||
@@ -748,10 +932,31 @@ footer {
|
||||
.map-layer-panel {
|
||||
top: 68px;
|
||||
right: 8px;
|
||||
width: min(320px, calc(100% - 16px));
|
||||
width: calc(100% - 16px);
|
||||
max-height: calc(100% - 144px);
|
||||
}
|
||||
|
||||
.layer-manager-with-actions > summary {
|
||||
grid-template-columns: 28px 20px minmax(0, 1fr) auto;
|
||||
}
|
||||
|
||||
.layer-manager-with-actions > summary > .layer-row-actions {
|
||||
grid-row: 2;
|
||||
grid-column: 3;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
.layer-manager-with-actions > summary > .layer-move-buttons {
|
||||
grid-row: 1;
|
||||
grid-column: 4;
|
||||
}
|
||||
|
||||
.layer-manager-with-actions > summary > .layer-manager-count {
|
||||
grid-row: 2;
|
||||
grid-column: 4;
|
||||
justify-self: end;
|
||||
}
|
||||
|
||||
.tool-sheet {
|
||||
top: 10%;
|
||||
bottom: var(--nav-height);
|
||||
@@ -810,6 +1015,12 @@ footer {
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 701px) and (max-width: 1100px) {
|
||||
.map-layer-panel {
|
||||
width: min(680px, calc(100% - 24px));
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 380px) {
|
||||
.app-identity span {
|
||||
display: none;
|
||||
|
||||
+1345
-48
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user