Compare commits

..
30 changed files with 2062 additions and 123 deletions

No files matched your search

+391 -9
View File
@@ -3,6 +3,7 @@
@inject PreciseLocationService LocationService @inject PreciseLocationService LocationService
@inject CadastralCatalogService CatalogService @inject CadastralCatalogService CatalogService
@inject OfficialCadastreService OfficialCadastreService @inject OfficialCadastreService OfficialCadastreService
@inject FiducialPointService FiducialPointService
@inject LocationSearchService LocationSearchService @inject LocationSearchService LocationSearchService
@inject NetworkLocationService NetworkLocationService @inject NetworkLocationService NetworkLocationService
@inject AzureMapsService AzureMapsService @inject AzureMapsService AzureMapsService
@@ -18,7 +19,7 @@
<PageTitle>LME Mappe Catastali Pro</PageTitle> <PageTitle>LME Mappe Catastali Pro</PageTitle>
<div class="map-app"> <div class="map-app">
<section class="map-stage @(ActiveTab == "search" ? "search-active" : null)"> <section class="map-stage @(ActiveTab == "search" ? "search-active" : null) @(LayerPanelOpen ? "layers-open" : null)">
<div id="map"></div> <div id="map"></div>
<header class="map-toolbar"> <header class="map-toolbar">
@@ -46,6 +47,7 @@
<button @onclick='() => SelectTab("map")'>@L("menu.map")</button> <button @onclick='() => SelectTab("map")'>@L("menu.map")</button>
<button @onclick='() => SelectTab("search")'>@L("menu.search")</button> <button @onclick='() => SelectTab("search")'>@L("menu.search")</button>
<button @onclick='() => SelectTab("cadastre")'>@L("menu.cadastre")</button> <button @onclick='() => SelectTab("cadastre")'>@L("menu.cadastre")</button>
<button @onclick='() => SelectTab("fiducials")'>Punti fiduciali</button>
<button @onclick='() => SelectTab("data")'>@L("menu.data")</button> <button @onclick='() => SelectTab("data")'>@L("menu.data")</button>
<button @onclick='() => SelectTab("projects")'>@L("menu.projects")</button> <button @onclick='() => SelectTab("projects")'>@L("menu.projects")</button>
<button @onclick='() => SelectTab("save")'>@L("menu.export")</button> <button @onclick='() => SelectTab("save")'>@L("menu.export")</button>
@@ -94,6 +96,16 @@
<small>Particelle e geometrie verdi di file e progetti</small> <small>Particelle e geometrie verdi di file e progetti</small>
</span> </span>
</label> </label>
@if (CanUse(AppFeatures.FiducialPoints))
{
<label class="map-layer-option">
<input type="checkbox" @bind="ShowFiducialPoints" @bind:after="ApplyFiducialVisibility" />
<span>
<strong>Punti fiduciali</strong>
<small>PF georiferiti caricati nella ricerca Pro</small>
</span>
</label>
}
<section class="layer-tree-section"> <section class="layer-tree-section">
<header> <header>
<strong>Ordine livelli e oggetti</strong> <strong>Ordine livelli e oggetti</strong>
@@ -109,13 +121,18 @@
</section> </section>
} }
<div class="gps-overlay @(ActiveTab == "search" ? "search-open" : null)"> <div class="gps-overlay @(ActiveTab == "search" ? "search-open" : null) @(GpsOverlayCollapsed ? "is-collapsed" : null)">
<div class="gps-state"> <div class="gps-state">
<span id="gpsState">GPS non attivo</span> <span id="gpsState">GPS non attivo</span>
<strong id="parcelState">Nessuna particella selezionata</strong> <strong id="parcelState">Nessuna particella selezionata</strong>
</div> </div>
<button class="gps-main" @onclick="ToggleGps">@(GpsActive ? "Ferma GPS" : "Avvia GPS")</button> <div class="gps-actions">
<button class="gps-center" @onclick="CenterOnGps" aria-label="Centra posizione">Centra</button> <button class="gps-main" @onclick="ToggleGps">@(GpsActive ? "Ferma GPS" : "Avvia GPS")</button>
<button class="gps-center" @onclick="CenterOnGps" aria-label="Centra posizione GPS">Centra</button>
</div>
<button class="gps-collapse" @onclick="ToggleGpsOverlay" aria-label="@(GpsOverlayCollapsed ? "Espandi pannello GPS" : "Riduci pannello GPS")" title="@(GpsOverlayCollapsed ? "Espandi pannello GPS" : "Riduci pannello GPS")">
<span aria-hidden="true">@(GpsOverlayCollapsed ? "+" : "−")</span>
</button>
</div> </div>
@if (ActiveTab is not "map" and not "search") @if (ActiveTab is not "map" and not "search")
@@ -196,6 +213,98 @@
<MenuHelp Topic="cadastre" /> <MenuHelp Topic="cadastre" />
</section> </section>
} }
else if (ActiveTab == "fiducials")
{
<section class="panel-content">
@if (!CanUse(AppFeatures.FiducialPoints))
{
<div class="service-note protected-service">
<strong>Funzione LME Pro</strong>
<p>La ricerca dei Punti Fiduciali e delle monografie ufficiali è disponibile con abbonamento Pro o chiave manuale valida.</p>
<button class="primary-command" @onclick='() => SelectTab("settings")'>Apri abbonamento Pro</button>
</div>
}
else
{
<label>
Provincia
<select value="@SelectedFiducialProvinceCode" @onchange="OnFiducialProvinceChanged" disabled="@FiducialBusy">
<option value="">Seleziona provincia</option>
@foreach (var province in FiducialProvinces)
{
<option value="@province.Code">@province.Name</option>
}
</select>
</label>
<label>
Comune catastale
<select value="@SelectedFiducialMunicipalityCode" @onchange="OnFiducialMunicipalityChanged" disabled="@(FiducialMunicipalities.Count == 0 || FiducialBusy)">
<option value="">Seleziona comune</option>
@foreach (var municipality in FiducialMunicipalities)
{
<option value="@municipality.Code">@municipality.Name (@municipality.Code)</option>
}
</select>
</label>
<label>
Foglio
<select @bind="SelectedFiducialSheet" disabled="@(FiducialSheets.Count == 0 || FiducialBusy)">
<option value="">Seleziona foglio</option>
@foreach (var sheet in FiducialSheets)
{
<option value="@sheet.Code">@sheet.Name</option>
}
</select>
</label>
<button class="primary-command" @onclick="SearchFiducials" disabled="@(string.IsNullOrWhiteSpace(SelectedFiducialSheet) || FiducialBusy)">
@(FiducialBusy ? "Ricerca..." : "Cerca Punti Fiduciali")
</button>
<label class="toggle-line">
<input type="checkbox" @bind="ShowFiducialPoints" @bind:after="ApplyFiducialVisibility" />
<span>Mostra i PF sulla mappa</span>
</label>
<label>
Colore PF
<input type="color" @bind="FiducialColor" @bind:after="ApplyFiducialColor" />
</label>
@if (!string.IsNullOrWhiteSpace(FiducialMessage))
{
<div class="catalog-progress"><span>@FiducialMessage</span></div>
}
@if (MappedFiducialPoints.Count > 0)
{
<section class="panel-section">
<h2>Punti cartografici (@MappedFiducialPoints.Count)</h2>
<button class="secondary-command" @onclick="FitFiducialPoints">Inquadra tutti i PF</button>
<div class="fiducial-list">
@foreach (var point in MappedFiducialPoints)
{
<article class="fiducial-item">
<strong>@point.Identifier</strong>
<small>Nord/X: @FormatCoordinate(point.CadastralNorth) · Est/Y: @FormatCoordinate(point.CadastralEast)</small>
@if (!string.IsNullOrWhiteSpace(point.MonographUrl))
{
<button class="secondary-command" @onclick="() => DownloadFiducialMonograph(point.MonographUrl)">Scarica PDF monografia</button>
}
</article>
}
</div>
</section>
}
<div class="service-note">
<strong>Monografie ufficiali, posizione sperimentale</strong>
<p>Elenco e PDF provengono dall'Agenzia delle Entrate; il posizionamento sperimentale usa il servizio cartografico GloboGIS. Le coordinate sono un ausilio: verificale prima di qualsiasi uso topografico o professionale.</p>
</div>
}
</section>
}
else if (ActiveTab == "data") else if (ActiveTab == "data")
{ {
<section class="panel-content"> <section class="panel-content">
@@ -235,6 +344,10 @@
<section class="panel-section"> <section class="panel-section">
<h2>Disegni e misure</h2> <h2>Disegni e misure</h2>
@if (!Entitlements.HasProAccess)
{
<small class="field-help">@L("drawings.base.limit")</small>
}
<div class="button-row"> <div class="button-row">
<button class="secondary-command" @onclick="UndoMapChange">Annulla</button> <button class="secondary-command" @onclick="UndoMapChange">Annulla</button>
<button class="secondary-command" @onclick="RedoMapChange">Ripristina</button> <button class="secondary-command" @onclick="RedoMapChange">Ripristina</button>
@@ -494,8 +607,8 @@
<p>@L("settings.pro.note")</p> <p>@L("settings.pro.note")</p>
<p>@L("settings.pro.offline")</p> <p>@L("settings.pro.offline")</p>
<div class="button-row"> <div class="button-row">
<button class="primary-command" @onclick='() => SubscribeGooglePro(EntitlementService.MonthlyBasePlanId)' disabled="@BillingBusy">@L("settings.pro.monthly")</button> <button class="primary-command" @onclick='() => SubscribeGooglePro(EntitlementService.MonthlyBasePlanId)' disabled="@BillingBusy">@MonthlyPlanLabel</button>
<button class="primary-command" @onclick='() => SubscribeGooglePro(EntitlementService.YearlyBasePlanId)' disabled="@BillingBusy">@L("settings.pro.yearly")</button> <button class="primary-command" @onclick='() => SubscribeGooglePro(EntitlementService.YearlyBasePlanId)' disabled="@BillingBusy">@YearlyPlanLabel</button>
</div> </div>
<div class="button-row"> <div class="button-row">
<button class="secondary-command" @onclick="RestorePurchases" disabled="@BillingBusy">@L("settings.pro.restore")</button> <button class="secondary-command" @onclick="RestorePurchases" disabled="@BillingBusy">@L("settings.pro.restore")</button>
@@ -549,6 +662,11 @@
Trasparenza catasto Trasparenza catasto
<input type="range" min="0" max="1" step="0.05" value="@CadastralOpacity.ToString(System.Globalization.CultureInfo.InvariantCulture)" @onchange="ChangeCadastreOpacity" /> <input type="range" min="0" max="1" step="0.05" value="@CadastralOpacity.ToString(System.Globalization.CultureInfo.InvariantCulture)" @onchange="ChangeCadastreOpacity" />
</label> </label>
<label>
Durata messaggi mappa (secondi)
<input type="number" min="0" max="30" step="1" @bind="MapMessageTimeoutSeconds" @bind:after="ApplyMapMessageOptions" />
</label>
<small class="field-help">Imposta 0 per lasciare i messaggi visibili fino alla chiusura manuale.</small>
</section> </section>
<section class="panel-section"> <section class="panel-section">
@@ -637,6 +755,12 @@
} }
</section> </section>
<section class="panel-section">
<h2>Privacy</h2>
<p class="field-help">Consulta come vengono trattati posizione, progetti, licenze e dati inviati ai servizi esterni.</p>
<button class="secondary-command" @onclick="OpenPrivacyPolicy">Apri informativa sulla privacy</button>
</section>
<section class="panel-section"> <section class="panel-section">
<h2>GPS e percorso</h2> <h2>GPS e percorso</h2>
<label class="toggle-line project-save-option"> <label class="toggle-line project-save-option">
@@ -679,7 +803,10 @@
</aside> </aside>
} }
<div id="mapInfo" class="map-info">Pronto</div> <div id="mapInfo" class="map-info" role="status" aria-live="polite">
<span id="mapInfoText" class="map-info-text">Pronto</span>
<button type="button" class="map-info-close" onclick="window.lmeMap.hideInfo()" aria-label="Chiudi messaggio" title="Chiudi messaggio">×</button>
</div>
<div id="wmsPreview" class="wms-preview" hidden> <div id="wmsPreview" class="wms-preview" hidden>
<section class="wms-preview-dialog" role="dialog" aria-modal="true" aria-labelledby="wmsPreviewTitle"> <section class="wms-preview-dialog" role="dialog" aria-modal="true" aria-labelledby="wmsPreviewTitle">
@@ -719,7 +846,15 @@
private string MeasurementPreference { get; set; } = "auto"; private string MeasurementPreference { get; set; } = "auto";
private string ManualLicenseCode { get; set; } = string.Empty; private string ManualLicenseCode { get; set; } = string.Empty;
private string ManualLicenseMessage { get; set; } = string.Empty; private string ManualLicenseMessage { get; set; } = string.Empty;
private string MonthlyPrice { get; set; } = string.Empty;
private string YearlyPrice { get; set; } = string.Empty;
private bool BillingBusy { get; set; } private bool BillingBusy { get; set; }
private bool FiducialBusy { get; set; }
private string SelectedFiducialProvinceCode { get; set; } = string.Empty;
private string SelectedFiducialMunicipalityCode { get; set; } = string.Empty;
private string SelectedFiducialSheet { get; set; } = string.Empty;
private string FiducialMessage { get; set; } = string.Empty;
private string FiducialColor { get; set; } = "#dc2626";
private string Status { get; set; } = "online"; private string Status { get; set; } = "online";
private string SelectedBaseLayer { get; set; } = "satellite"; private string SelectedBaseLayer { get; set; } = "satellite";
private string GoogleMapsApiKey { get; set; } = string.Empty; private string GoogleMapsApiKey { get; set; } = string.Empty;
@@ -731,10 +866,13 @@
private string CatalogMessage { get; set; } = string.Empty; private string CatalogMessage { get; set; } = string.Empty;
private double? CatalogFraction { get; set; } private double? CatalogFraction { get; set; }
private double CadastralOpacity { get; set; } = 0.75; private double CadastralOpacity { get; set; } = 0.75;
private int MapMessageTimeoutSeconds { get; set; } = 3;
private bool CatalogBusy { get; set; } private bool CatalogBusy { get; set; }
private bool GpsActive { get; set; } private bool GpsActive { get; set; }
private bool GpsOverlayCollapsed { get; set; }
private bool ShowGpsPosition { get; set; } = true; private bool ShowGpsPosition { get; set; } = true;
private bool ShowSelectedParcels { get; set; } = true; private bool ShowSelectedParcels { get; set; } = true;
private bool ShowFiducialPoints { get; set; } = true;
private bool ShowImportedData { 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; }
@@ -778,6 +916,12 @@
private string UpdateDownloadUrl { get; set; } = string.Empty; private string UpdateDownloadUrl { get; set; } = string.Empty;
private string UpdateReleaseNotes { get; set; } = string.Empty; private string UpdateReleaseNotes { get; set; } = string.Empty;
private string ProUpgradeText => "Funzione inclusa in LME Pro. I dati esistenti restano consultabili."; private string ProUpgradeText => "Funzione inclusa in LME Pro. I dati esistenti restano consultabili.";
private string MonthlyPlanLabel => string.IsNullOrWhiteSpace(MonthlyPrice)
? L("settings.pro.monthly")
: $"{L("settings.pro.monthly")} - {MonthlyPrice}/mese";
private string YearlyPlanLabel => string.IsNullOrWhiteSpace(YearlyPrice)
? L("settings.pro.yearly")
: $"{L("settings.pro.yearly")} - {YearlyPrice}/anno";
private CancellationTokenSource? CatalogCancellation { get; set; } private CancellationTokenSource? CatalogCancellation { get; set; }
private CancellationTokenSource? GpsLookupCancellation { get; set; } private CancellationTokenSource? GpsLookupCancellation { get; set; }
private CancellationTokenSource? ProjectAutoSaveCancellation { get; set; } private CancellationTokenSource? ProjectAutoSaveCancellation { get; set; }
@@ -788,6 +932,11 @@
private IReadOnlyList<MunicipalityOption> Municipalities { get; set; } = []; private IReadOnlyList<MunicipalityOption> Municipalities { get; set; } = [];
private IReadOnlyList<string> Sheets { get; set; } = []; private IReadOnlyList<string> Sheets { get; set; } = [];
private IReadOnlyList<ParcelOption> Parcels { get; set; } = []; private IReadOnlyList<ParcelOption> Parcels { get; set; } = [];
private IReadOnlyList<FiducialAreaOption> FiducialProvinces { get; set; } = [];
private IReadOnlyList<FiducialAreaOption> FiducialMunicipalities { get; set; } = [];
private IReadOnlyList<FiducialAreaOption> FiducialSheets { get; set; } = [];
private IReadOnlyList<FiducialPointEntry> FiducialPoints { get; set; } = [];
private IReadOnlyList<MappedFiducialPoint> MappedFiducialPoints { get; set; } = [];
private IReadOnlyList<MapProjectSummary> Projects { get; set; } = []; private IReadOnlyList<MapProjectSummary> Projects { get; set; } = [];
private IReadOnlyList<MapProjectVersion> ProjectVersions { get; set; } = []; private IReadOnlyList<MapProjectVersion> ProjectVersions { get; set; } = [];
private MapProjectSummary? SelectedProject => Projects.FirstOrDefault(item => item.Id == SelectedProjectId); private MapProjectSummary? SelectedProject => Projects.FirstOrDefault(item => item.Id == SelectedProjectId);
@@ -801,6 +950,7 @@
private string PanelTitle => ActiveTab switch private string PanelTitle => ActiveTab switch
{ {
"cadastre" => "Ricerca catastale", "cadastre" => "Ricerca catastale",
"fiducials" => "Punti fiduciali",
"data" => "Dati e disegni", "data" => "Dati e disegni",
"projects" => "Archivio progetti", "projects" => "Archivio progetti",
"save" => "Salvataggio ed esportazione", "save" => "Salvataggio ed esportazione",
@@ -812,6 +962,7 @@
private string PanelEyebrow => ActiveTab switch private string PanelEyebrow => ActiveTab switch
{ {
"cadastre" => "Regione, Comune, Foglio, Particella", "cadastre" => "Regione, Comune, Foglio, Particella",
"fiducials" => "Monografie ufficiali AdE",
"data" => "File GIS, misure e POI", "data" => "File GIS, misure e POI",
"projects" => "Salva, apri e visualizza i tuoi lavori", "projects" => "Salva, apri e visualizza i tuoi lavori",
"save" => "Esporta file GIS", "save" => "Esporta file GIS",
@@ -886,6 +1037,7 @@
await ApplyEntitlementsToMapAsync(); await ApplyEntitlementsToMapAsync();
await ApplyFlagPreferencesToMapAsync(); await ApplyFlagPreferencesToMapAsync();
await ApplyAdvancedOptions(); await ApplyAdvancedOptions();
await RefreshBillingStateAsync();
await CenterOnInitialLocationAsync(); await CenterOnInitialLocationAsync();
await MigrateLegacyProjectAsync(); await MigrateLegacyProjectAsync();
var offlineCount = await JS.InvokeAsync<int>("lmeMap.getOfflineTileStats"); var offlineCount = await JS.InvokeAsync<int>("lmeMap.getOfflineTileStats");
@@ -1022,6 +1174,10 @@
{ {
await RefreshProjectsAsync(); await RefreshProjectsAsync();
} }
if (tab == "fiducials" && CanUse(AppFeatures.FiducialPoints) && FiducialProvinces.Count == 0)
{
await LoadFiducialProvincesAsync();
}
await Task.Delay(30); await Task.Delay(30);
await JS.InvokeVoidAsync("lmeMap.resize"); await JS.InvokeVoidAsync("lmeMap.resize");
if (LayerPanelOpen) if (LayerPanelOpen)
@@ -1101,6 +1257,185 @@
: await CatalogService.GetMunicipalitiesAsync(SelectedRegionFile); : await CatalogService.GetMunicipalitiesAsync(SelectedRegionFile);
} }
private async Task LoadFiducialProvincesAsync()
{
FiducialBusy = true;
FiducialMessage = "Carico l'elenco delle province...";
try
{
FiducialProvinces = await FiducialPointService.GetProvincesAsync();
FiducialMessage = string.Empty;
}
catch (Exception error)
{
FiducialMessage = $"Servizio monografie non disponibile: {error.GetBaseException().Message}";
}
finally
{
FiducialBusy = false;
}
}
private async Task OnFiducialProvinceChanged(ChangeEventArgs args)
{
SelectedFiducialProvinceCode = args.Value?.ToString() ?? string.Empty;
SelectedFiducialMunicipalityCode = string.Empty;
SelectedFiducialSheet = string.Empty;
FiducialMunicipalities = [];
FiducialSheets = [];
FiducialPoints = [];
MappedFiducialPoints = [];
if (string.IsNullOrWhiteSpace(SelectedFiducialProvinceCode))
{
FiducialMessage = string.Empty;
return;
}
FiducialBusy = true;
FiducialMessage = "Carico i Comuni catastali...";
try
{
FiducialMunicipalities = await FiducialPointService.GetMunicipalitiesAsync(SelectedFiducialProvinceCode);
FiducialMessage = string.Empty;
}
catch (Exception error)
{
FiducialMessage = $"Comuni non disponibili: {error.GetBaseException().Message}";
}
finally
{
FiducialBusy = false;
}
}
private async Task OnFiducialMunicipalityChanged(ChangeEventArgs args)
{
SelectedFiducialMunicipalityCode = args.Value?.ToString() ?? string.Empty;
SelectedFiducialSheet = string.Empty;
FiducialSheets = [];
FiducialPoints = [];
MappedFiducialPoints = [];
if (string.IsNullOrWhiteSpace(SelectedFiducialMunicipalityCode))
{
FiducialMessage = string.Empty;
return;
}
FiducialBusy = true;
FiducialMessage = "Carico i fogli disponibili...";
try
{
FiducialSheets = await FiducialPointService.GetSheetsAsync(
SelectedFiducialProvinceCode,
SelectedFiducialMunicipalityCode);
FiducialMessage = string.Empty;
}
catch (Exception error)
{
FiducialMessage = $"Fogli non disponibili: {error.GetBaseException().Message}";
}
finally
{
FiducialBusy = false;
}
}
private async Task SearchFiducials()
{
var province = FiducialProvinces.FirstOrDefault(item => item.Code == SelectedFiducialProvinceCode);
var municipality = FiducialMunicipalities.FirstOrDefault(item => item.Code == SelectedFiducialMunicipalityCode);
if (province is null || municipality is null || string.IsNullOrWhiteSpace(SelectedFiducialSheet))
{
return;
}
FiducialBusy = true;
FiducialPoints = [];
MappedFiducialPoints = [];
FiducialMessage = "Recupero monografie e coordinate dei PF...";
try
{
string? monographError = null;
try
{
FiducialPoints = await FiducialPointService.GetFiducialsAsync(
province.Name,
municipality.Name,
municipality.Code,
SelectedFiducialSheet);
}
catch (Exception error)
{
monographError = error.GetBaseException().Message;
}
var mapped = await FiducialPointService.GetMappedFiducialsAsync(
municipality.Code,
SelectedFiducialSheet);
var monographs = FiducialPoints.ToDictionary(
item => item.Identifier,
item => item.MonographUrl,
StringComparer.OrdinalIgnoreCase);
var currentMappedPoints = monographs.Count == 0
? mapped
: mapped.Where(point => monographs.ContainsKey(point.Identifier)).ToArray();
MappedFiducialPoints = currentMappedPoints
.Select(point => point with
{
MonographUrl = monographs.GetValueOrDefault(point.Identifier, string.Empty)
})
.ToArray();
await JS.InvokeVoidAsync(
"lmeMap.setFiducialPoints",
MappedFiducialPoints,
FiducialColor,
ShowFiducialPoints);
FiducialMessage = MappedFiducialPoints.Count == 0
? "Nessun Punto Fiduciale georiferito per il foglio selezionato."
: $"Trovati {MappedFiducialPoints.Count} PF cartografici e {FiducialPoints.Count} monografie ufficiali."
+ (monographError is null ? string.Empty : " Le monografie non sono al momento raggiungibili.");
}
catch (Exception error)
{
FiducialMessage = $"Ricerca PF non riuscita: {error.GetBaseException().Message}";
}
finally
{
FiducialBusy = false;
}
}
private async Task DownloadFiducialMonograph(string monographUrl)
{
try
{
await Launcher.Default.OpenAsync(new Uri(monographUrl));
}
catch (Exception error)
{
FiducialMessage = $"Impossibile aprire la monografia: {error.GetBaseException().Message}";
}
}
private async Task ApplyFiducialVisibility()
{
SaveFlagPreferences();
await JS.InvokeVoidAsync("lmeMap.setFiducialPointsVisible", ShowFiducialPoints);
}
private async Task ApplyFiducialColor()
{
SaveFlagPreferences();
await JS.InvokeVoidAsync("lmeMap.setFiducialColor", FiducialColor);
}
private async Task FitFiducialPoints() =>
await JS.InvokeVoidAsync("lmeMap.fitFiducialPoints");
private static string FormatCoordinate(double? value) =>
value?.ToString("0.000", System.Globalization.CultureInfo.InvariantCulture) ?? "-";
private async Task OnMunicipalityChanged(ChangeEventArgs args) private async Task OnMunicipalityChanged(ChangeEventArgs args)
{ {
SelectedMunicipalityCode = args.Value?.ToString() ?? string.Empty; SelectedMunicipalityCode = args.Value?.ToString() ?? string.Empty;
@@ -1286,7 +1621,7 @@
Interlocked.Exchange(ref LastGpsLookupAt, now); Interlocked.Exchange(ref LastGpsLookupAt, now);
try try
{ {
var radius = Math.Clamp(location.Accuracy ?? 5, 2, 25); var radius = Math.Clamp(location.Accuracy ?? 12, 12, 30);
var xml = await OfficialCadastreService.GetParcelsNearAsync( var xml = await OfficialCadastreService.GetParcelsNearAsync(
location.Latitude, location.Latitude,
location.Longitude, location.Longitude,
@@ -2075,6 +2410,12 @@
private Task CenterOnGps() => JS.InvokeVoidAsync("lmeMap.centerOnGps").AsTask(); private Task CenterOnGps() => JS.InvokeVoidAsync("lmeMap.centerOnGps").AsTask();
private void ToggleGpsOverlay()
{
GpsOverlayCollapsed = !GpsOverlayCollapsed;
SaveFlagPreferences();
}
private string L(string key) => L10n.T(key); private string L(string key) => L10n.T(key);
private bool CanUse(string feature) => Entitlements.CanUse(feature); private bool CanUse(string feature) => Entitlements.CanUse(feature);
@@ -2112,9 +2453,26 @@
private Task ApplyEntitlementsToMapAsync() => JS.InvokeVoidAsync("lmeMap.setEntitlements", new private Task ApplyEntitlementsToMapAsync() => JS.InvokeVoidAsync("lmeMap.setEntitlements", new
{ {
advancedGeometry = CanUse(AppFeatures.AdvancedGeometry) advancedGeometry = CanUse(AppFeatures.AdvancedGeometry),
maxDrawingObjects = Entitlements.HasProAccess ? (int?)null : EntitlementService.BaseDrawingObjectLimit,
drawingLimitMessage = L("drawings.base.limit.reached")
}).AsTask(); }).AsTask();
private async Task RefreshBillingStateAsync()
{
var plans = await Entitlements.GetSubscriptionPlansAsync();
MonthlyPrice = plans.FirstOrDefault(plan => plan.BasePlanId == EntitlementService.MonthlyBasePlanId)?.FormattedPrice
?? string.Empty;
YearlyPrice = plans.FirstOrDefault(plan => plan.BasePlanId == EntitlementService.YearlyBasePlanId)?.FormattedPrice
?? string.Empty;
if (DeviceInfo.Current.Platform == DevicePlatform.Android)
{
await Entitlements.RestorePurchasesAsync();
await ApplyEntitlementsToMapAsync();
}
}
private async Task RestorePurchases() private async Task RestorePurchases()
{ {
BillingBusy = true; BillingBusy = true;
@@ -2303,6 +2661,8 @@
DrawToolsVisible = GetFlagPreference("draw_tools_visible", false); DrawToolsVisible = GetFlagPreference("draw_tools_visible", false);
ShowGpsPosition = GetFlagPreference("show_gps_position", true); ShowGpsPosition = GetFlagPreference("show_gps_position", true);
ShowSelectedParcels = GetFlagPreference("show_selected_parcels", true); ShowSelectedParcels = GetFlagPreference("show_selected_parcels", true);
ShowFiducialPoints = GetFlagPreference("show_fiducial_points", true);
FiducialColor = Preferences.Default.Get($"{FlagPreferencePrefix}fiducial_color", "#dc2626");
TrailEnabled = GetFlagPreference("trail_enabled", false); TrailEnabled = GetFlagPreference("trail_enabled", false);
ExportImported = GetFlagPreference("export_imported", true); ExportImported = GetFlagPreference("export_imported", true);
ExportImportedSheets = GetFlagPreference("export_imported_sheets", true); ExportImportedSheets = GetFlagPreference("export_imported_sheets", true);
@@ -2320,6 +2680,11 @@
OfflineExtraZoomLevels = Preferences.Default.Get($"{FlagPreferencePrefix}offline_zoom_levels", 2); OfflineExtraZoomLevels = Preferences.Default.Get($"{FlagPreferencePrefix}offline_zoom_levels", 2);
GpsProximityEnabled = GetFlagPreference("gps_proximity", true); GpsProximityEnabled = GetFlagPreference("gps_proximity", true);
GpsBoundaryAlertEnabled = GetFlagPreference("gps_boundary_alert", false); GpsBoundaryAlertEnabled = GetFlagPreference("gps_boundary_alert", false);
GpsOverlayCollapsed = GetFlagPreference("gps_overlay_collapsed", false);
MapMessageTimeoutSeconds = Math.Clamp(
Preferences.Default.Get($"{FlagPreferencePrefix}map_message_timeout", 3),
0,
30);
foreach (var layer in CadastralLayers) foreach (var layer in CadastralLayers)
{ {
@@ -2338,6 +2703,8 @@
SetFlagPreference("draw_tools_visible", DrawToolsVisible); SetFlagPreference("draw_tools_visible", DrawToolsVisible);
SetFlagPreference("show_gps_position", ShowGpsPosition); SetFlagPreference("show_gps_position", ShowGpsPosition);
SetFlagPreference("show_selected_parcels", ShowSelectedParcels); SetFlagPreference("show_selected_parcels", ShowSelectedParcels);
SetFlagPreference("show_fiducial_points", ShowFiducialPoints);
Preferences.Default.Set($"{FlagPreferencePrefix}fiducial_color", FiducialColor);
SetFlagPreference("trail_enabled", TrailEnabled); SetFlagPreference("trail_enabled", TrailEnabled);
SetFlagPreference("export_imported", ExportImported); SetFlagPreference("export_imported", ExportImported);
SetFlagPreference("export_imported_sheets", ExportImportedSheets); SetFlagPreference("export_imported_sheets", ExportImportedSheets);
@@ -2355,6 +2722,8 @@
Preferences.Default.Set($"{FlagPreferencePrefix}offline_zoom_levels", OfflineExtraZoomLevels); Preferences.Default.Set($"{FlagPreferencePrefix}offline_zoom_levels", OfflineExtraZoomLevels);
SetFlagPreference("gps_proximity", GpsProximityEnabled); SetFlagPreference("gps_proximity", GpsProximityEnabled);
SetFlagPreference("gps_boundary_alert", GpsBoundaryAlertEnabled); SetFlagPreference("gps_boundary_alert", GpsBoundaryAlertEnabled);
SetFlagPreference("gps_overlay_collapsed", GpsOverlayCollapsed);
Preferences.Default.Set($"{FlagPreferencePrefix}map_message_timeout", MapMessageTimeoutSeconds);
foreach (var layer in CadastralLayers) foreach (var layer in CadastralLayers)
{ {
@@ -2364,6 +2733,7 @@
private async Task ApplyFlagPreferencesToMapAsync() private async Task ApplyFlagPreferencesToMapAsync()
{ {
await JS.InvokeVoidAsync("lmeMap.setInfoTimeout", MapMessageTimeoutSeconds);
await JS.InvokeVoidAsync("lmeMap.setIncludeKmlSheetLayer", IncludeKmlSheetLayer); await JS.InvokeVoidAsync("lmeMap.setIncludeKmlSheetLayer", IncludeKmlSheetLayer);
await JS.InvokeVoidAsync("lmeMap.setImportedLayerVisible", ShowImportedData); await JS.InvokeVoidAsync("lmeMap.setImportedLayerVisible", ShowImportedData);
await JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer); await JS.InvokeVoidAsync("lmeMap.setImportedSheetLayerVisible", ShowImportedSheetLayer);
@@ -2372,6 +2742,8 @@
await JS.InvokeVoidAsync("lmeMap.setDrawToolsVisible", DrawToolsVisible); await JS.InvokeVoidAsync("lmeMap.setDrawToolsVisible", DrawToolsVisible);
await JS.InvokeVoidAsync("lmeMap.setGpsPositionVisible", ShowGpsPosition); await JS.InvokeVoidAsync("lmeMap.setGpsPositionVisible", ShowGpsPosition);
await JS.InvokeVoidAsync("lmeMap.setSelectedParcelsVisible", ShowSelectedParcels); await JS.InvokeVoidAsync("lmeMap.setSelectedParcelsVisible", ShowSelectedParcels);
await JS.InvokeVoidAsync("lmeMap.setFiducialColor", FiducialColor);
await JS.InvokeVoidAsync("lmeMap.setFiducialPointsVisible", ShowFiducialPoints);
await JS.InvokeVoidAsync("lmeMap.toggleTrail", TrailEnabled); await JS.InvokeVoidAsync("lmeMap.toggleTrail", TrailEnabled);
foreach (var layer in CadastralLayers) foreach (var layer in CadastralLayers)
@@ -2380,6 +2752,13 @@
} }
} }
private async Task ApplyMapMessageOptions()
{
MapMessageTimeoutSeconds = Math.Clamp(MapMessageTimeoutSeconds, 0, 30);
SaveFlagPreferences();
await JS.InvokeVoidAsync("lmeMap.setInfoTimeout", MapMessageTimeoutSeconds);
}
private async Task ApplyAdvancedOptions() private async Task ApplyAdvancedOptions()
{ {
SaveFlagPreferences(); SaveFlagPreferences();
@@ -2431,6 +2810,9 @@
private Task OpenOfficialReservedArea() => Microsoft.Maui.ApplicationModel.Launcher.Default.OpenAsync( private Task OpenOfficialReservedArea() => Microsoft.Maui.ApplicationModel.Launcher.Default.OpenAsync(
new Uri("https://www.agenziaentrate.gov.it/portale/area-riservata")); new Uri("https://www.agenziaentrate.gov.it/portale/area-riservata"));
private Task OpenPrivacyPolicy() => Microsoft.Maui.ApplicationModel.Launcher.Default.OpenAsync(
new Uri("https://gitea.lmcloud.it/livio/LMEMappeCatastaliProApp/raw/branch/play-store-pro/PRIVACY_POLICY.md"));
private sealed class CadastralLayer(string key, string name, bool enabled, string detail = "") private sealed class CadastralLayer(string key, string name, bool enabled, string detail = "")
{ {
public string Key { get; } = key; public string Key { get; } = key;
+18 -2
View File
@@ -28,8 +28,8 @@
<ApplicationId>it.liviomerola.lmemappecatastali.pro</ApplicationId> <ApplicationId>it.liviomerola.lmemappecatastali.pro</ApplicationId>
<!-- Versions --> <!-- Versions -->
<ApplicationDisplayVersion>1.0.1</ApplicationDisplayVersion> <ApplicationDisplayVersion>1.0.13</ApplicationDisplayVersion>
<ApplicationVersion>101</ApplicationVersion> <ApplicationVersion>113</ApplicationVersion>
<Version>$(ApplicationDisplayVersion)</Version> <Version>$(ApplicationDisplayVersion)</Version>
<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged --> <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
@@ -43,6 +43,22 @@
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<PlayBillingVerificationUrl Condition="'$(PlayBillingVerificationUrl)' == ''"></PlayBillingVerificationUrl>
<PlayBillingVerificationRequired Condition="'$(PlayBillingVerificationRequired)' == ''">false</PlayBillingVerificationRequired>
</PropertyGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
<_Parameter1>PlayBillingVerificationUrl</_Parameter1>
<_Parameter2>$(PlayBillingVerificationUrl)</_Parameter2>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
<_Parameter1>PlayBillingVerificationRequired</_Parameter1>
<_Parameter2>$(PlayBillingVerificationRequired)</_Parameter2>
</AssemblyAttribute>
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release' and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'"> <PropertyGroup Condition="'$(Configuration)' == 'Release' and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<AndroidTargetSdkVersion>36</AndroidTargetSdkVersion> <AndroidTargetSdkVersion>36</AndroidTargetSdkVersion>
<AndroidPackageFormat>aab</AndroidPackageFormat> <AndroidPackageFormat>aab</AndroidPackageFormat>
+2
View File
@@ -19,6 +19,7 @@ public static class MauiProgram
builder.Services.AddSingleton<PreciseLocationService>(); builder.Services.AddSingleton<PreciseLocationService>();
builder.Services.AddSingleton<CadastralCatalogService>(); builder.Services.AddSingleton<CadastralCatalogService>();
builder.Services.AddSingleton<OfficialCadastreService>(); builder.Services.AddSingleton<OfficialCadastreService>();
builder.Services.AddSingleton<FiducialPointService>();
builder.Services.AddSingleton<LocationSearchService>(); builder.Services.AddSingleton<LocationSearchService>();
builder.Services.AddSingleton<NetworkLocationService>(); builder.Services.AddSingleton<NetworkLocationService>();
builder.Services.AddSingleton<AzureMapsService>(); builder.Services.AddSingleton<AzureMapsService>();
@@ -29,6 +30,7 @@ public static class MauiProgram
builder.Services.AddSingleton(IncomingFileService.Shared); builder.Services.AddSingleton(IncomingFileService.Shared);
builder.Services.AddSingleton<AppLocalizationService>(); builder.Services.AddSingleton<AppLocalizationService>();
builder.Services.AddSingleton<ManualLicenseService>(); builder.Services.AddSingleton<ManualLicenseService>();
builder.Services.AddSingleton<PlayPurchaseVerificationService>();
#if ANDROID #if ANDROID
builder.Services.AddSingleton<IPlayBillingService, Platforms.Android.AndroidPlayBillingService>(); builder.Services.AddSingleton<IPlayBillingService, Platforms.Android.AndroidPlayBillingService>();
#else #else
+6 -3
View File
@@ -4,7 +4,7 @@
- Nome: LME Mappe Catastali Pro. - Nome: LME Mappe Catastali Pro.
- Package name Android: `it.liviomerola.lmemappecatastali.pro`. - Package name Android: `it.liviomerola.lmemappecatastali.pro`.
- Versione iniziale Play: `1.0.0` / version code `100`. - Versione corrente da pubblicare: `1.0.11` / version code `111`.
- Formato Release Android: Android App Bundle (`.aab`). - Formato Release Android: Android App Bundle (`.aab`).
- Target SDK Release: Android 16 / API 36. - Target SDK Release: Android 16 / API 36.
@@ -17,7 +17,7 @@ Base gratuita:
- consultazione mappa catastale; - consultazione mappa catastale;
- ricerca localita e ricerca catastale; - ricerca localita e ricerca catastale;
- GPS live; - GPS live;
- disegni e misure base; - fino a 15 disegni, misure, POI e punti GPS creati dall'utente;
- apertura e consultazione dei dati gia presenti. - apertura e consultazione dei dati gia presenti.
Pro: Pro:
@@ -28,6 +28,7 @@ Pro:
- mappe offline; - mappe offline;
- strumenti geometrici avanzati; - strumenti geometrici avanzati;
- traccia GPS. - traccia GPS.
- disegni, misure, POI e punti GPS senza limite applicativo.
Se l'abbonamento non risulta verificabile offline, l'app conserva una tolleranza locale e non elimina, sequestra o altera i dati dell'utente. Le funzioni Pro possono essere disabilitate, ma i dati esistenti devono restare consultabili. Se l'abbonamento non risulta verificabile offline, l'app conserva una tolleranza locale e non elimina, sequestra o altera i dati dell'utente. Le funzioni Pro possono essere disabilitate, ma i dati esistenti devono restare consultabili.
@@ -43,7 +44,9 @@ Il codice contiene solo identificativi di prodotto e base plan. Non inserire chi
Il client Android usa Google Play Billing 9.1 tramite `Xamarin.Android.Google.BillingClient 9.1.0.2`. Acquisto, ripristino, acknowledgement e interrogazione delle sottoscrizioni sono collegati a `EntitlementService`. Il client Android usa Google Play Billing 9.1 tramite `Xamarin.Android.Google.BillingClient 9.1.0.2`. Acquisto, ripristino, acknowledgement e interrogazione delle sottoscrizioni sono collegati a `EntitlementService`.
Prima della produzione serve ancora la verifica server-side dei purchase token. La verifica solo sul dispositivo e adatta ai test interni, ma non e sufficiente come protezione definitiva. Il client supporta la verifica server-side dei purchase token tramite un endpoint HTTPS configurato in fase di build. Il servizio di riferimento e in `tools/LmePlayVerifier` e usa la Google Play Developer API senza incorporare credenziali nell'app.
Per il test chiuso l'endpoint puo restare disattivato. Prima della produzione occorre pubblicare il servizio, autorizzare il relativo service account nella Play Console e compilare l'app con `PlayBillingVerificationUrl` e `PlayBillingVerificationRequired=true`.
## Licenze manuali ## Licenze manuali
+87
View File
@@ -0,0 +1,87 @@
# Informativa sulla privacy di LME Mappe Catastali Pro
Data di efficacia: 30 settembre 2026
## Titolare e contatti
LME Mappe Catastali Pro e pubblicata da **LME Software - Livio Merola**.
Per richieste relative alla privacy, alla rettifica o alla cancellazione dei dati:
- email: `livio.merola@gmail.com`
## Ambito dell'informativa
Questa informativa descrive il trattamento dei dati effettuato dall'app LME Mappe Catastali Pro. L'app non richiede la creazione di un account LME e non invia automaticamente al titolare progetti, disegni, file importati o tracce GPS.
I servizi esterni scelti o utilizzati dall'utente applicano anche le rispettive informative sulla privacy.
## Posizione del dispositivo
Con il consenso dell'utente, l'app accede alla posizione approssimativa e precisa mentre e in uso per:
- mostrare la posizione sulla mappa;
- verificare la posizione rispetto a particelle e geometrie;
- eseguire misure e salvare punti GPS;
- registrare una traccia esclusivamente quando l'utente attiva questa funzione.
La posizione GPS e le tracce sono elaborate e conservate localmente nel dispositivo o nei progetti e backup scelti dall'utente. L'app non richiede la posizione in background.
All'avvio l'app puo richiedere a `ipapi.co` una posizione approssimativa basata sull'indirizzo IP per centrare la mappa senza avviare il GPS. Il servizio riceve necessariamente l'indirizzo IP e dati tecnici della richiesta.
## Ricerche, mappe e dati catastali
Per fornire mappe, geocodifica e informazioni catastali, l'app puo comunicare con:
- servizi cartografici e WFS/WMS dell'Agenzia delle Entrate;
- OpenStreetMap e Nominatim;
- ArcGIS Geocoding;
- Microsoft Azure Maps, solo quando configurato dall'utente;
- servizi nativi di geocodifica del sistema operativo;
- cataloghi catastali pubblici ospitati su GitHub.
In base alla funzione usata, tali servizi possono ricevere testo di ricerca, coordinate, area visualizzata, indirizzo IP e informazioni tecniche necessarie a rispondere. Il titolare non usa questi dati per profilazione o pubblicita.
## Progetti, importazioni, esportazioni e backup
Progetti, geometrie, disegni, punti di interesse, tracce, mappe offline, preferenze e backup sono conservati sul dispositivo o nella destinazione selezionata dall'utente.
L'utente puo importare ed esportare file e condividerli mediante le applicazioni installate. In questi casi il trattamento successivo dipende dalla destinazione scelta dall'utente.
La sincronizzazione WebDAV e facoltativa. Endpoint, nome utente e password sono forniti dall'utente; la password viene conservata nell'archivio sicuro del dispositivo. I backup vengono trasmessi al server WebDAV indicato soltanto su comando dell'utente o secondo le opzioni di backup da lui attivate. L'app accetta esclusivamente endpoint WebDAV HTTPS.
## Licenze e acquisti
Gli acquisti e gli abbonamenti Google Play sono gestiti da Google. L'app riceve da Google Play le informazioni tecniche necessarie a determinare lo stato del prodotto acquistato e ad abilitare le funzioni Pro. Quando il servizio di verifica LME e configurato, l'app gli trasmette il token tecnico dell'acquisto, il pacchetto dell'app e l'identificativo del prodotto per verificare presso Google Play lo stato e la scadenza dell'abbonamento. Il token non contiene i dati della carta di pagamento e non viene usato per profilazione o pubblicita. Le informazioni dell'account e del pagamento sono trattate da Google secondo la sua informativa.
Le licenze manuali contengono nome, cognome, email, identificativo e scadenza in un codice cifrato e firmato. Il codice viene conservato nell'archivio sicuro del dispositivo. Il titolare registra localmente gli stessi dati, insieme a data di emissione, scadenza, note e stato amministrativo, per gestire la licenza e l'assistenza.
## Credenziali e chiavi configurate dall'utente
Le password WebDAV, le chiavi personali per servizi cartografici e il codice di licenza manuale sono conservati tramite l'archivio sicuro del sistema operativo. Non sono incorporati nel pacchetto dell'app e non vengono inviati al titolare.
## Aggiornamenti e dati tecnici
Quando l'utente controlla la disponibilita di aggiornamenti, l'app contatta il repository pubblico LME su `gitea.lmcloud.it`. Come per ogni richiesta Internet, il server puo ricevere indirizzo IP, data e ora e informazioni tecniche della connessione.
L'app non integra sistemi pubblicitari e non utilizza i dati per pubblicita comportamentale. Alla data di efficacia non integra strumenti LME di analisi o telemetria degli utenti.
## Conservazione e cancellazione
I dati dell'app rimangono sul dispositivo finche l'utente non elimina i singoli contenuti, cancella i dati dell'app o disinstalla l'app. La perdita o la scadenza della licenza Pro non elimina i contenuti dell'utente.
I dati inviati a un server WebDAV restano disponibili secondo le impostazioni e le regole del server scelto dall'utente e devono essere eliminati presso tale servizio.
Il registro amministrativo delle licenze manuali e conservato per il tempo necessario alla gestione della licenza, dell'assistenza e degli obblighi contabili o legali applicabili. L'interessato puo richiedere accesso, rettifica o cancellazione scrivendo all'indirizzo indicato sopra; eventuali dati soggetti a obblighi di conservazione saranno eliminati alla scadenza di tali obblighi.
## Sicurezza
L'app usa gli strumenti di sicurezza del sistema operativo per proteggere credenziali, chiavi e licenze memorizzate localmente. Le comunicazioni con i servizi preconfigurati avvengono tramite HTTPS. La sicurezza e la conservazione dei file condivisi o dei servizi configurati dall'utente dipendono anche dalle applicazioni e dai fornitori scelti.
## Minori
L'app e uno strumento cartografico professionale e non e destinata specificamente a minori di 13 anni. Il titolare non raccoglie consapevolmente dati personali di minori tramite l'app.
## Modifiche
Questa informativa puo essere aggiornata quando cambiano le funzioni dell'app, i servizi utilizzati o gli obblighi normativi. La versione aggiornata sara pubblicata allo stesso indirizzo, con la nuova data di efficacia.
-27
View File
@@ -1,27 +0,0 @@
# Informativa privacy - bozza
Questa bozza deve essere completata con i dati del titolare, i contatti, la data di efficacia e un URL pubblico prima della pubblicazione su Google Play.
## Dati trattati
LME Mappe Catastali usa la posizione del dispositivo per mostrare la posizione sulla mappa, verificare l'inclusione nelle geometrie e, solo su comando dell'utente, registrare una traccia GPS. Progetti, disegni, mappe offline, preferenze e backup sono conservati sul dispositivo o nelle destinazioni scelte dall'utente.
Le licenze manuali contengono nome, cognome, email, identificativo e scadenza. Questi dati sono cifrati nel codice licenza e conservati localmente nell'area sicura dell'app. Il gestore usato dal titolare registra gli stessi dati in un database amministrativo locale.
Gli acquisti Google Play sono gestiti da Google. L'app interroga lo stato della sottoscrizione per abilitare le funzioni Pro.
## Servizi di rete
L'app puo contattare servizi cartografici e catastali pubblici, provider di geocoding e mappe, Azure Maps quando configurato dall'utente, e un server WebDAV scelto dall'utente. Indirizzi di ricerca, coordinate, indirizzi IP e dati tecnici possono quindi essere trattati dai rispettivi fornitori secondo le loro informative.
Credenziali WebDAV e chiavi personali configurate nell'app sono conservate nel SecureStorage del dispositivo e non sono incluse nel pacchetto applicativo.
## Conservazione e controllo
L'utente puo eliminare progetti, cache, mappe offline, credenziali e licenza manuale dall'app o cancellando i dati applicativi. La scadenza o perdita della licenza Pro non cancella i contenuti esistenti.
Il registro amministrativo delle licenze manuali deve essere conservato solo per il tempo necessario alla gestione contrattuale, fiscale e di assistenza, con accesso limitato e backup protetti.
## Permessi Android
L'app richiede accesso a Internet e stato della rete, posizione approssimativa e precisa e Google Play Billing. La registrazione della traccia viene avviata dall'utente.
+93 -18
View File
@@ -9,6 +9,7 @@ public sealed class AndroidPlayBillingService : Java.Lang.Object, IPlayBillingSe
private readonly SemaphoreSlim _connectionLock = new(1, 1); private readonly SemaphoreSlim _connectionLock = new(1, 1);
private readonly BillingClient _client; private readonly BillingClient _client;
private TaskCompletionSource<PlayBillingResult>? _purchaseCompletion; private TaskCompletionSource<PlayBillingResult>? _purchaseCompletion;
private string? _lastCatalogFailure;
public AndroidPlayBillingService() public AndroidPlayBillingService()
{ {
@@ -24,6 +25,40 @@ public sealed class AndroidPlayBillingService : Java.Lang.Object, IPlayBillingSe
.Build(); .Build();
} }
public async Task<IReadOnlyList<PlaySubscriptionPlan>> GetSubscriptionPlansAsync(
CancellationToken cancellationToken = default)
{
try
{
var details = await GetProductDetailsAsync(cancellationToken);
return details?.GetSubscriptionOfferDetails()?
.Where(item => !string.IsNullOrWhiteSpace(item.BasePlanId)
&& !string.IsNullOrWhiteSpace(item.OfferToken))
.GroupBy(item => item.BasePlanId, StringComparer.Ordinal)
.Select(group => group
.OrderBy(item => string.IsNullOrEmpty(item.OfferId) ? 0 : 1)
.First())
.Select(item =>
{
var phase = item.PricingPhases.PricingPhaseList.LastOrDefault();
return phase is null
? null
: new PlaySubscriptionPlan(item.BasePlanId, phase.FormattedPrice, phase.BillingPeriod);
})
.Where(item => item is not null)
.Cast<PlaySubscriptionPlan>()
.ToArray() ?? [];
}
catch (OperationCanceledException)
{
throw;
}
catch
{
return [];
}
}
public async Task<PlayBillingResult> RestoreAsync(CancellationToken cancellationToken = default) public async Task<PlayBillingResult> RestoreAsync(CancellationToken cancellationToken = default)
{ {
try try
@@ -45,7 +80,9 @@ public sealed class AndroidPlayBillingService : Java.Lang.Object, IPlayBillingSe
} }
var acknowledgement = await AcknowledgeIfNeededAsync(purchase); var acknowledgement = await AcknowledgeIfNeededAsync(purchase);
return acknowledgement ?? PlayBillingResult.Active("Abbonamento LME Pro ripristinato da Google Play."); return acknowledgement ?? PlayBillingResult.Active(
"Abbonamento LME Pro ripristinato da Google Play.",
purchase.PurchaseToken);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
@@ -61,26 +98,32 @@ public sealed class AndroidPlayBillingService : Java.Lang.Object, IPlayBillingSe
{ {
try try
{ {
await EnsureConnectedAsync(cancellationToken); if (string.IsNullOrWhiteSpace(basePlanId))
var product = QueryProductDetailsParams.Product.NewBuilder()
.SetProductId(EntitlementService.ProductId)
.SetProductType(BillingClient.ProductType.Subs)
.Build();
var query = QueryProductDetailsParams.NewBuilder()
.SetProductList([product])
.Build();
var detailsResult = await _client.QueryProductDetailsAsync(query);
if (detailsResult.Result.ResponseCode != BillingResponseCode.Ok)
{ {
return PlayBillingResult.Failed(ToMessage(detailsResult.Result)); return PlayBillingResult.Failed("Piano LME Pro non valido.");
} }
var details = detailsResult.ProductDetailsList.FirstOrDefault(); var details = await GetProductDetailsAsync(cancellationToken);
var offer = details?.GetSubscriptionOfferDetails()? var offer = details?.GetSubscriptionOfferDetails()?
.FirstOrDefault(item => item.BasePlanId == basePlanId && string.IsNullOrEmpty(item.OfferId)); .Where(item => item.BasePlanId == basePlanId
if (details is null || offer is null) && !string.IsNullOrWhiteSpace(item.OfferToken))
.OrderBy(item => string.IsNullOrEmpty(item.OfferId) ? 0 : 1)
.FirstOrDefault();
if (details is null)
{ {
return PlayBillingResult.Failed("Piano LME Pro non disponibile. Verifica prodotto e base plan nella Play Console."); return PlayBillingResult.Failed(_lastCatalogFailure
?? "Google Play non ha restituito l'abbonamento lme_pro.");
}
if (offer is null)
{
var availablePlans = string.Join(", ", details.GetSubscriptionOfferDetails()?
.Select(item => item.BasePlanId)
.Where(item => !string.IsNullOrWhiteSpace(item))
.Distinct(StringComparer.Ordinal) ?? []);
return PlayBillingResult.Failed(string.IsNullOrWhiteSpace(availablePlans)
? $"Google Play ha restituito lme_pro senza offerte acquistabili per il piano {basePlanId}."
: $"Piano {basePlanId} non restituito da Google Play. Piani ricevuti: {availablePlans}.");
} }
var productParams = BillingFlowParams.ProductDetailsParams.NewBuilder() var productParams = BillingFlowParams.ProductDetailsParams.NewBuilder()
@@ -96,7 +139,8 @@ public sealed class AndroidPlayBillingService : Java.Lang.Object, IPlayBillingSe
var completion = new TaskCompletionSource<PlayBillingResult>(TaskCreationOptions.RunContinuationsAsynchronously); var completion = new TaskCompletionSource<PlayBillingResult>(TaskCreationOptions.RunContinuationsAsynchronously);
_purchaseCompletion = completion; _purchaseCompletion = completion;
using var registration = cancellationToken.Register(() => completion.TrySetCanceled(cancellationToken)); using var registration = cancellationToken.Register(() => completion.TrySetCanceled(cancellationToken));
var launchResult = _client.LaunchBillingFlow(activity, flow); var launchResult = await MainThread.InvokeOnMainThreadAsync(() =>
_client.LaunchBillingFlow(activity, flow));
if (launchResult.ResponseCode != BillingResponseCode.Ok) if (launchResult.ResponseCode != BillingResponseCode.Ok)
{ {
_purchaseCompletion = null; _purchaseCompletion = null;
@@ -144,7 +188,38 @@ public sealed class AndroidPlayBillingService : Java.Lang.Object, IPlayBillingSe
} }
var acknowledgement = await AcknowledgeIfNeededAsync(purchase); var acknowledgement = await AcknowledgeIfNeededAsync(purchase);
completion.TrySetResult(acknowledgement ?? PlayBillingResult.Active("Abbonamento LME Pro attivato.")); completion.TrySetResult(acknowledgement ?? PlayBillingResult.Active(
"Abbonamento LME Pro attivato.",
purchase.PurchaseToken));
}
private async Task<ProductDetails?> GetProductDetailsAsync(CancellationToken cancellationToken)
{
await EnsureConnectedAsync(cancellationToken);
var product = QueryProductDetailsParams.Product.NewBuilder()
.SetProductId(EntitlementService.ProductId)
.SetProductType(BillingClient.ProductType.Subs)
.Build();
var query = QueryProductDetailsParams.NewBuilder()
.SetProductList([product])
.Build();
var result = await _client.QueryProductDetailsAsync(query);
if (result.Result.ResponseCode != BillingResponseCode.Ok)
{
throw new InvalidOperationException(ToMessage(result.Result));
}
// The .NET async wrapper copies the Java result into the managed
// ProductDetails property; ProductDetailsList has no Java handle here.
var details = result.ProductDetails?.FirstOrDefault();
if (details is not null)
{
_lastCatalogFailure = null;
return details;
}
_lastCatalogFailure = "Google Play ha restituito un catalogo vuoto per lme_pro. Verifica account Play Store, adesione al test e origine dell'installazione.";
return null;
} }
private async Task EnsureConnectedAsync(CancellationToken cancellationToken) private async Task EnsureConnectedAsync(CancellationToken cancellationToken)
+30
View File
@@ -4,6 +4,8 @@ using Android.Content.PM;
using Android.Database; using Android.Database;
using Android.OS; using Android.OS;
using Android.Provider; using Android.Provider;
using Android.Views;
using AndroidX.Core.View;
using LMEMappeCatastaliApp.Services; using LMEMappeCatastaliApp.Services;
namespace LMEMappeCatastaliApp; namespace LMEMappeCatastaliApp;
@@ -24,9 +26,18 @@ public class MainActivity : MauiAppCompatActivity
protected override void OnCreate(Bundle? savedInstanceState) protected override void OnCreate(Bundle? savedInstanceState)
{ {
base.OnCreate(savedInstanceState); base.OnCreate(savedInstanceState);
ApplySystemBarInsets();
QueueViewedFile(Intent); QueueViewedFile(Intent);
} }
private void ApplySystemBarInsets()
{
var content = FindViewById<Android.Views.View>(Android.Resource.Id.Content);
if (content is null) return;
ViewCompat.SetOnApplyWindowInsetsListener(content, new SystemBarInsetsListener(content));
ViewCompat.RequestApplyInsets(content);
}
protected override void OnNewIntent(Intent? intent) protected override void OnNewIntent(Intent? intent)
{ {
base.OnNewIntent(intent); base.OnNewIntent(intent);
@@ -80,4 +91,23 @@ public class MainActivity : MauiAppCompatActivity
var index = cursor.GetColumnIndex(IOpenableColumns.DisplayName); var index = cursor.GetColumnIndex(IOpenableColumns.DisplayName);
return index >= 0 ? cursor.GetString(index) : null; return index >= 0 ? cursor.GetString(index) : null;
} }
private sealed class SystemBarInsetsListener(Android.Views.View content) : Java.Lang.Object, IOnApplyWindowInsetsListener
{
private readonly int _left = content.PaddingLeft;
private readonly int _top = content.PaddingTop;
private readonly int _right = content.PaddingRight;
public WindowInsetsCompat? OnApplyWindowInsets(Android.Views.View? view, WindowInsetsCompat? insets)
{
if (view is null || insets is null) return insets;
var systemBars = insets.GetInsets(WindowInsetsCompat.Type.SystemBars());
view.SetPadding(
_left,
systemBars?.Top ?? _top,
_right,
systemBars?.Bottom ?? 0);
return insets;
}
}
} }
+52
View File
@@ -2,6 +2,57 @@
App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata per consultare mappe catastali e lavorare sul campo con GPS. App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata per consultare mappe catastali e lavorare sul campo con GPS.
Informativa privacy: [PRIVACY_POLICY.md](PRIVACY_POLICY.md).
## Versione Pro 1.0.11 test
- Il flag Fogli catastali mostra il WMS di tutti i fogli agli zoom panoramici e, in dettaglio, il confine ufficiale WFS del foglio corrente anche senza dati caricati.
- Se il foglio corrente e gia presente in un progetto o in un'importazione, l'overlay di navigazione non ne crea un duplicato.
- La toolbar superiore rispetta l'area occupata dalla barra di stato e dalle notifiche Android.
## Versione Pro 1.0.10 test
- Migliora la compatibilita del servizio catastale AdE sui dispositivi Android meno recenti con HTTP/1.1, tentativi automatici e una ricerca GPS piu tollerante.
- I messaggi sulla mappa si chiudono automaticamente dopo un intervallo configurabile, predefinito a 3 secondi, e includono un pulsante di chiusura.
- La barra GPS mantiene sempre disponibili i comandi Avvia/Ferma e Centra, impilati sugli schermi stretti, e puo essere ridotta.
## Versione Pro 1.0.9 test
- Corregge la lettura del catalogo dal wrapper asincrono .NET di Google Play Billing, usando la raccolta managed `ProductDetails` popolata dal binding.
## Versione Pro 1.0.8 test
- Google Play Billing accetta tutte le offerte idonee restituite per i piani `monthly` e `yearly`, preferendo il piano base quando disponibile.
- In caso di catalogo vuoto o prodotto non caricato, il messaggio mostra una diagnostica specifica restituita da Google Play.
## Versione Pro 1.0.7 test
- I messaggi informativi su telefono vengono mostrati sopra i controlli zoom e possono occupare fino a tre righe senza sovrapporsi.
- Durante il rilevamento GPS la mappa si ricentra automaticamente quando la nuova posizione esce dall'area visibile, mantenendo lo zoom corrente.
## Versione Pro 1.0.6 test
- Il pannello Layer usa tutta la larghezza disponibile sui telefoni e le righe si adattano ai testi su piu linee senza sovrapporsi.
- La barra superiore tronca il titolo in modo controllato e il riepilogo GPS non rimane dietro al pannello Layer.
## Versione Pro 1.0.5 test
- Il flusso di acquisto Google Play gestisce correttamente prodotti o offerte non restituiti dal catalogo, senza mostrare eccezioni tecniche.
- L'apertura della schermata di acquisto viene eseguita sul thread principale Android.
## Versione Pro 1.0.4 test
- I prezzi mensile e annuale vengono letti direttamente dal catalogo Google Play.
- Il piano Base consente fino a 15 oggetti disegnati; LME Pro non applica limiti.
## Versione Pro 1.0.3 test
- I pannelli mobili rispettano la barra di navigazione Android e mantengono il pulsante Help completamente raggiungibile tramite scorrimento.
## Versione Pro 1.0.2 test
- Linee e punti KML/KMZ vengono sempre importati, anche quando il documento viene riconosciuto come catastale; il filtro particelle separa soltanto i poligoni di foglio o cornice.
## Versione Pro 1.0.1 test ## Versione Pro 1.0.1 test
- Il controllo aggiornamenti Pro ignora le release e gli APK della versione Base e segue esclusivamente il canale Pro. - Il controllo aggiornamenti Pro ignora le release e gli APK della versione Base e segue esclusivamente il canale Pro.
@@ -20,6 +71,7 @@ App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata pe
- L'accesso Pro puo derivare da Google Play oppure da un codice manuale cifrato e firmato, con ritorno automatico a Base alla scadenza. Il gestore e le istruzioni sono in `tools/LmeLicenseManager` e `MANUAL_LICENSES.md`. - L'accesso Pro puo derivare da Google Play oppure da un codice manuale cifrato e firmato, con ritorno automatico a Base alla scadenza. Il gestore e le istruzioni sono in `tools/LmeLicenseManager` e `MANUAL_LICENSES.md`.
- Lingua e sistema di misura sono centralizzati in `Services/AppLocalizationService.cs` e propagati alla mappa JavaScript, incluse distanze, superfici e Leaflet Draw. - Lingua e sistema di misura sono centralizzati in `Services/AppLocalizationService.cs` e propagati alla mappa JavaScript, incluse distanze, superfici e Leaflet Draw.
- La checklist Play Store, Billing, firma e privacy e in `PLAY_STORE_PRO_CHECKLIST.md`. - La checklist Play Store, Billing, firma e privacy e in `PLAY_STORE_PRO_CHECKLIST.md`.
- Il piano Base consente fino a 15 disegni, misure, POI e punti GPS; LME Pro non applica questo limite.
- Il progetto usa .NET 10, target Android API 36 e Google Play Billing 9.1. - Il progetto usa .NET 10, target Android API 36 e Google Play Billing 9.1.
- La ricerca nel pannello Layer conserva correttamente posizione e selezione del cursore durante il filtraggio; digitando `pio` il testo non viene piu invertito in `oip`. - La ricerca nel pannello Layer conserva correttamente posizione e selezione del cursore durante il filtraggio; digitando `pio` il testo non viene piu invertito in `oip`.
+4
View File
@@ -44,6 +44,8 @@ public sealed class AppLocalizationService
["settings.pro.monthly"] = "Pro mensile", ["settings.pro.monthly"] = "Pro mensile",
["settings.pro.yearly"] = "Pro annuale", ["settings.pro.yearly"] = "Pro annuale",
["settings.pro.note"] = "Il prodotto LME Pro si configura nella Play Console con piano mensile e annuale.", ["settings.pro.note"] = "Il prodotto LME Pro si configura nella Play Console con piano mensile e annuale.",
["drawings.base.limit"] = "Piano Base: fino a 15 disegni, misure, POI e punti GPS. LME Pro non ha limiti.",
["drawings.base.limit.reached"] = "Hai raggiunto il limite di 15 oggetti del piano Base. Elimina un disegno o passa a LME Pro per continuare senza limiti.",
["settings.pro.manual.code"] = "Codice licenza manuale", ["settings.pro.manual.code"] = "Codice licenza manuale",
["settings.pro.manual.help"] = "Incolla il codice cifrato ricevuto. Nome, email e scadenza vengono letti solo dopo la verifica crittografica.", ["settings.pro.manual.help"] = "Incolla il codice cifrato ricevuto. Nome, email e scadenza vengono letti solo dopo la verifica crittografica.",
["settings.pro.manual.activate"] = "Attiva codice", ["settings.pro.manual.activate"] = "Attiva codice",
@@ -92,6 +94,8 @@ public sealed class AppLocalizationService
["settings.pro.monthly"] = "Monthly Pro", ["settings.pro.monthly"] = "Monthly Pro",
["settings.pro.yearly"] = "Yearly Pro", ["settings.pro.yearly"] = "Yearly Pro",
["settings.pro.note"] = "Create the LME Pro product in Play Console with monthly and yearly base plans.", ["settings.pro.note"] = "Create the LME Pro product in Play Console with monthly and yearly base plans.",
["drawings.base.limit"] = "Base plan: up to 15 drawings, measurements, POIs and GPS points. LME Pro is unlimited.",
["drawings.base.limit.reached"] = "You reached the Base plan limit of 15 objects. Delete a drawing or upgrade to LME Pro to continue without limits.",
["settings.pro.manual.code"] = "Manual license code", ["settings.pro.manual.code"] = "Manual license code",
["settings.pro.manual.help"] = "Paste the encrypted code you received. Name, email and expiry are read only after cryptographic verification.", ["settings.pro.manual.help"] = "Paste the encrypted code you received. Name, email and expiry are read only after cryptographic verification.",
["settings.pro.manual.activate"] = "Activate code", ["settings.pro.manual.activate"] = "Activate code",
+2 -2
View File
@@ -36,9 +36,9 @@ public sealed class CloudSyncService
private static Uri BuildTarget(string endpoint) private static Uri BuildTarget(string endpoint)
{ {
if (!Uri.TryCreate(endpoint?.Trim(), UriKind.Absolute, out var uri) if (!Uri.TryCreate(endpoint?.Trim(), UriKind.Absolute, out var uri)
|| (uri.Scheme != Uri.UriSchemeHttps && uri.Scheme != Uri.UriSchemeHttp)) || uri.Scheme != Uri.UriSchemeHttps)
{ {
throw new ArgumentException("Inserisci un indirizzo WebDAV http o https valido."); throw new ArgumentException("Inserisci un indirizzo WebDAV HTTPS valido.");
} }
return uri.AbsolutePath.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) return uri.AbsolutePath.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)
? uri ? uri
+46 -8
View File
@@ -1,10 +1,14 @@
namespace LMEMappeCatastaliApp.Services; namespace LMEMappeCatastaliApp.Services;
public sealed class EntitlementService(ManualLicenseService manualLicenses, IPlayBillingService playBilling) public sealed class EntitlementService(
ManualLicenseService manualLicenses,
IPlayBillingService playBilling,
PlayPurchaseVerificationService purchaseVerification)
{ {
public const string ProductId = "lme_pro"; public const string ProductId = "lme_pro";
public const string MonthlyBasePlanId = "monthly"; public const string MonthlyBasePlanId = "monthly";
public const string YearlyBasePlanId = "yearly"; public const string YearlyBasePlanId = "yearly";
public const int BaseDrawingObjectLimit = 15;
private const string GoogleProActivePreference = "entitlement_google_pro_active"; private const string GoogleProActivePreference = "entitlement_google_pro_active";
private const string GoogleExpiresAtPreference = "entitlement_google_pro_expires_at"; private const string GoogleExpiresAtPreference = "entitlement_google_pro_expires_at";
@@ -17,7 +21,8 @@ public sealed class EntitlementService(ManualLicenseService manualLicenses, IPla
AppFeatures.CloudSync, AppFeatures.CloudSync,
AppFeatures.OfflineMaps, AppFeatures.OfflineMaps,
AppFeatures.AdvancedGeometry, AppFeatures.AdvancedGeometry,
AppFeatures.GpsTrail AppFeatures.GpsTrail,
AppFeatures.FiducialPoints
}; };
public bool IsGoogleProActive { get; private set; } public bool IsGoogleProActive { get; private set; }
@@ -53,6 +58,10 @@ public sealed class EntitlementService(ManualLicenseService manualLicenses, IPla
public bool RequiresPro(string feature) => ProFeatures.Contains(feature); public bool RequiresPro(string feature) => ProFeatures.Contains(feature);
public bool CanUse(string feature) => !RequiresPro(feature) || HasProAccess; public bool CanUse(string feature) => !RequiresPro(feature) || HasProAccess;
public Task<IReadOnlyList<PlaySubscriptionPlan>> GetSubscriptionPlansAsync(
CancellationToken cancellationToken = default) =>
playBilling.GetSubscriptionPlansAsync(cancellationToken);
public async Task LoadAsync() public async Task LoadAsync()
{ {
IsGoogleProActive = Preferences.Default.Get(GoogleProActivePreference, false); IsGoogleProActive = Preferences.Default.Get(GoogleProActivePreference, false);
@@ -85,32 +94,60 @@ public sealed class EntitlementService(ManualLicenseService manualLicenses, IPla
public async Task<PlayBillingResult> RestorePurchasesAsync() public async Task<PlayBillingResult> RestorePurchasesAsync()
{ {
var result = await playBilling.RestoreAsync(); var result = await playBilling.RestoreAsync();
ApplyPlayBillingResult(result); return await ApplyPlayBillingResultAsync(result);
return result;
} }
public async Task<PlayBillingResult> PurchaseGoogleProAsync(string basePlanId) public async Task<PlayBillingResult> PurchaseGoogleProAsync(string basePlanId)
{ {
var result = await playBilling.PurchaseAsync(basePlanId); var result = await playBilling.PurchaseAsync(basePlanId);
ApplyPlayBillingResult(result); return await ApplyPlayBillingResultAsync(result);
return result;
} }
private void ApplyPlayBillingResult(PlayBillingResult result) private async Task<PlayBillingResult> ApplyPlayBillingResultAsync(PlayBillingResult result)
{ {
if (!result.Completed) if (!result.Completed)
{ {
return; return result;
} }
if (result.HasActiveSubscription) if (result.HasActiveSubscription)
{ {
if (!string.IsNullOrWhiteSpace(result.PurchaseToken))
{
var verification = await purchaseVerification.VerifyAsync(result.PurchaseToken);
if (verification.Verified)
{
if (verification.Active)
{
ApplyVerifiedGooglePro(verification.ExpiresAt);
return result with
{
Message = string.IsNullOrWhiteSpace(verification.Message)
? result.Message
: verification.Message
};
}
ApplyGoogleBase();
return PlayBillingResult.Base(string.IsNullOrWhiteSpace(verification.Message)
? "L'abbonamento Google Play non risulta attivo."
: verification.Message);
}
if (purchaseVerification.IsRequired)
{
return PlayBillingResult.Failed(verification.Message);
}
}
ApplyVerifiedGooglePro(null); ApplyVerifiedGooglePro(null);
} }
else else
{ {
ApplyGoogleBase(); ApplyGoogleBase();
} }
return result;
} }
private void SaveGoogleState() private void SaveGoogleState()
@@ -149,4 +186,5 @@ public static class AppFeatures
public const string OfflineMaps = "offline-maps"; public const string OfflineMaps = "offline-maps";
public const string AdvancedGeometry = "advanced-geometry"; public const string AdvancedGeometry = "advanced-geometry";
public const string GpsTrail = "gps-trail"; public const string GpsTrail = "gps-trail";
public const string FiducialPoints = "fiducial-points";
} }
+262
View File
@@ -0,0 +1,262 @@
using System.Net;
using System.Net.Http.Headers;
using System.Text.Json;
using System.Text.RegularExpressions;
namespace LMEMappeCatastaliApp.Services;
public sealed partial class FiducialPointService
{
private const string ServiceBaseUrl = "https://www1.agenziaentrate.gov.it/servizi/Monografie/";
private const string MappedPointsUrl = "https://cartografia.globogis.it/arcgis/rest/services/fiduciali/Punti_fiduciali/MapServer/2/query";
private readonly HttpClient _httpClient = new() { Timeout = TimeSpan.FromSeconds(30) };
public FiducialPointService()
{
_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/1.0 (Android)");
_httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("text/html"));
}
public async Task<IReadOnlyList<FiducialAreaOption>> GetProvincesAsync(
CancellationToken cancellationToken = default)
{
var html = await GetHtmlAsync("ricerca.php", cancellationToken);
return ParseOptions(html, "provincia");
}
public async Task<IReadOnlyList<FiducialAreaOption>> GetMunicipalitiesAsync(
string provinceCode,
CancellationToken cancellationToken = default)
{
var code = NormalizeCode(provinceCode);
var html = await GetHtmlAsync($"ricerca.php?level=1&prov={Uri.EscapeDataString(code)}", cancellationToken);
return ParseOptions(html, "co");
}
public async Task<IReadOnlyList<FiducialAreaOption>> GetSheetsAsync(
string provinceCode,
string municipalityCode,
CancellationToken cancellationToken = default)
{
var province = NormalizeCode(provinceCode);
var municipality = NormalizeCode(municipalityCode);
var path = $"ricerca.php?level=2&prov={Uri.EscapeDataString(province)}";
var html = await PostFormAsync(path, new Dictionary<string, string> { ["co"] = municipality }, cancellationToken);
return ParseOptions(html, "foglio");
}
public async Task<IReadOnlyList<FiducialPointEntry>> GetFiducialsAsync(
string provinceName,
string municipalityName,
string municipalityCode,
string sheet,
CancellationToken cancellationToken = default)
{
var code = NormalizeCode(municipalityCode);
var normalizedSheet = sheet.Trim();
var query = string.Join("&",
[
$"provincia={Uri.EscapeDataString(provinceName.Trim())}",
$"comune={Uri.EscapeDataString(municipalityName.Trim())}",
$"co={Uri.EscapeDataString(code)}"
]);
var html = await PostFormAsync(
$"risultato.php?{query}",
new Dictionary<string, string> { ["foglio"] = normalizedSheet },
cancellationToken);
return DownloadLinkRegex().Matches(html)
.Select(match =>
{
var relativeUrl = WebUtility.HtmlDecode(match.Groups["url"].Value);
var fileName = WebUtility.HtmlDecode(match.Groups["name"].Value);
return new FiducialPointEntry(
FormatIdentifier(fileName),
new Uri(new Uri(ServiceBaseUrl), relativeUrl).AbsoluteUri);
})
.DistinctBy(item => item.Identifier, StringComparer.OrdinalIgnoreCase)
.OrderBy(item => item.Identifier, StringComparer.OrdinalIgnoreCase)
.ToArray();
}
public async Task<IReadOnlyList<MappedFiducialPoint>> GetMappedFiducialsAsync(
string municipalityCode,
string sheet,
CancellationToken cancellationToken = default)
{
var municipality = NormalizeCode(municipalityCode);
if (!int.TryParse(new string(sheet.Where(char.IsDigit).ToArray()), out var sheetNumber))
{
throw new ArgumentException("Numero di foglio non valido.", nameof(sheet));
}
var query = new Dictionary<string, string>
{
["f"] = "json",
["where"] = $"COMUNENAZI='{municipality}' AND FOGLIO={sheetNumber}",
["outFields"] = "ETICHETTA,PARTICELLA,NORD,EST,ATTENDIBIL,QUOTA,DATAAGGIOR,IDORIGINE,URL_AGENZI,FOGLIO,ALLEGATO,FIDUCIALE",
["returnGeometry"] = "true",
["outSR"] = "3857",
["resultRecordCount"] = "500"
};
var url = $"{MappedPointsUrl}?{string.Join('&', query.Select(item => $"{item.Key}={Uri.EscapeDataString(item.Value)}"))}";
using var response = await _httpClient.GetAsync(url, cancellationToken);
response.EnsureSuccessStatusCode();
await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);
using var document = await JsonDocument.ParseAsync(stream, cancellationToken: cancellationToken);
if (document.RootElement.TryGetProperty("error", out var error))
{
throw new InvalidOperationException(error.TryGetProperty("message", out var message)
? message.GetString()
: "Servizio cartografico PF non disponibile.");
}
if (!document.RootElement.TryGetProperty("features", out var features))
{
return [];
}
return features.EnumerateArray()
.Select(feature => ParseMappedPoint(feature, municipality))
.Where(point => point is not null)
.Cast<MappedFiducialPoint>()
.DistinctBy(point => point.Identifier, StringComparer.OrdinalIgnoreCase)
.OrderBy(point => point.Identifier, StringComparer.OrdinalIgnoreCase)
.ToArray();
}
private static MappedFiducialPoint? ParseMappedPoint(JsonElement feature, string municipalityCode)
{
if (!feature.TryGetProperty("geometry", out var geometry)
|| !TryGetDouble(geometry, "x", out var x)
|| !TryGetDouble(geometry, "y", out var y))
{
return null;
}
var attributes = feature.GetProperty("attributes");
var label = GetString(attributes, "ETICHETTA");
var identifier = FormatIdentifier(label);
if (identifier == label)
{
var sheet = GetString(attributes, "FOGLIO").PadLeft(4, '0');
var number = GetString(attributes, "FIDUCIALE").PadLeft(2, '0');
identifier = $"PF{number}/{sheet}/{municipalityCode}";
}
const double earthRadius = 6378137d;
var longitude = x / earthRadius * 180d / Math.PI;
var latitude = (2d * Math.Atan(Math.Exp(y / earthRadius)) - Math.PI / 2d) * 180d / Math.PI;
return new MappedFiducialPoint(
identifier,
latitude,
longitude,
GetNullableDouble(attributes, "NORD"),
GetNullableDouble(attributes, "EST"),
GetString(attributes, "ATTENDIBIL"),
GetNullableDouble(attributes, "QUOTA"),
GetString(attributes, "PARTICELLA"),
GetString(attributes, "DATAAGGIOR"),
GetString(attributes, "IDORIGINE"));
}
private static bool TryGetDouble(JsonElement element, string name, out double value)
{
value = 0;
return element.TryGetProperty(name, out var property)
&& (property.ValueKind == JsonValueKind.Number
? property.TryGetDouble(out value)
: double.TryParse(property.ToString(), System.Globalization.NumberStyles.Float,
System.Globalization.CultureInfo.InvariantCulture, out value));
}
private static double? GetNullableDouble(JsonElement element, string name) =>
TryGetDouble(element, name, out var value) ? value : null;
private static string GetString(JsonElement element, string name) =>
element.TryGetProperty(name, out var property) && property.ValueKind != JsonValueKind.Null
? property.ToString().Trim()
: string.Empty;
private async Task<string> GetHtmlAsync(string relativeUrl, CancellationToken cancellationToken)
{
using var response = await _httpClient.GetAsync(ServiceBaseUrl + relativeUrl, cancellationToken);
response.EnsureSuccessStatusCode();
return await response.Content.ReadAsStringAsync(cancellationToken);
}
private async Task<string> PostFormAsync(
string relativeUrl,
IReadOnlyDictionary<string, string> values,
CancellationToken cancellationToken)
{
using var content = new FormUrlEncodedContent(values);
using var response = await _httpClient.PostAsync(ServiceBaseUrl + relativeUrl, content, cancellationToken);
response.EnsureSuccessStatusCode();
return await response.Content.ReadAsStringAsync(cancellationToken);
}
private static IReadOnlyList<FiducialAreaOption> ParseOptions(string html, string selectId)
{
var select = SelectRegex().Matches(html)
.LastOrDefault(match => string.Equals(match.Groups["id"].Value, selectId, StringComparison.OrdinalIgnoreCase));
if (select is null)
{
return [];
}
return OptionRegex().Matches(select.Groups["body"].Value)
.Select(match => new FiducialAreaOption(
WebUtility.HtmlDecode(match.Groups["value"].Value).Trim(),
WebUtility.HtmlDecode(StripTagsRegex().Replace(match.Groups["label"].Value, string.Empty)).Trim()))
.Where(item => !string.IsNullOrWhiteSpace(item.Code) && !string.IsNullOrWhiteSpace(item.Name))
.DistinctBy(item => item.Code, StringComparer.OrdinalIgnoreCase)
.ToArray();
}
private static string NormalizeCode(string value)
{
var normalized = value.Trim().ToUpperInvariant();
if (normalized.Length is < 2 or > 4 || normalized.Any(character => !char.IsLetterOrDigit(character)))
{
throw new ArgumentException("Codice territoriale non valido.", nameof(value));
}
return normalized;
}
private static string FormatIdentifier(string fileName)
{
var parts = fileName.Split('-', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
return parts.Length == 3 ? $"PF{parts[2]}/{parts[1]}/{parts[0]}" : fileName;
}
[GeneratedRegex("<select\\b[^>]*(?:id|name)=[\\\"'](?<id>[^\\\"']+)[\\\"'][^>]*>(?<body>[\\s\\S]*?)</select>", RegexOptions.IgnoreCase, matchTimeoutMilliseconds: 2000)]
private static partial Regex SelectRegex();
[GeneratedRegex("<option\\b[^>]*value=[\\\"'](?<value>[^\\\"']*)[\\\"'][^>]*>(?<label>[\\s\\S]*?)</option>", RegexOptions.IgnoreCase, matchTimeoutMilliseconds: 2000)]
private static partial Regex OptionRegex();
[GeneratedRegex("href=[\\\"'](?<url>download\\.php\\?[^\\\"']*namefile=(?<name>[A-Z0-9-]+))[^\\\"']*[\\\"']", RegexOptions.IgnoreCase, matchTimeoutMilliseconds: 2000)]
private static partial Regex DownloadLinkRegex();
[GeneratedRegex("<[^>]+>", RegexOptions.None, 2000)]
private static partial Regex StripTagsRegex();
}
public sealed record FiducialAreaOption(string Code, string Name);
public sealed record FiducialPointEntry(string Identifier, string MonographUrl);
public sealed record MappedFiducialPoint(
string Identifier,
double Latitude,
double Longitude,
double? CadastralNorth,
double? CadastralEast,
string Reliability,
double? Elevation,
string Parcel,
string UpdatedAt,
string OriginId,
string MonographUrl = "");
+14 -2
View File
@@ -2,13 +2,22 @@ namespace LMEMappeCatastaliApp.Services;
public interface IPlayBillingService public interface IPlayBillingService
{ {
Task<IReadOnlyList<PlaySubscriptionPlan>> GetSubscriptionPlansAsync(CancellationToken cancellationToken = default);
Task<PlayBillingResult> RestoreAsync(CancellationToken cancellationToken = default); Task<PlayBillingResult> RestoreAsync(CancellationToken cancellationToken = default);
Task<PlayBillingResult> PurchaseAsync(string basePlanId, CancellationToken cancellationToken = default); Task<PlayBillingResult> PurchaseAsync(string basePlanId, CancellationToken cancellationToken = default);
} }
public sealed record PlayBillingResult(bool Completed, bool HasActiveSubscription, bool UserCancelled, string Message) public sealed record PlaySubscriptionPlan(string BasePlanId, string FormattedPrice, string BillingPeriod);
public sealed record PlayBillingResult(
bool Completed,
bool HasActiveSubscription,
bool UserCancelled,
string Message,
string? PurchaseToken = null)
{ {
public static PlayBillingResult Active(string message) => new(true, true, false, message); public static PlayBillingResult Active(string message, string? purchaseToken = null) =>
new(true, true, false, message, purchaseToken);
public static PlayBillingResult Base(string message) => new(true, false, false, message); public static PlayBillingResult Base(string message) => new(true, false, false, message);
public static PlayBillingResult Cancelled(string message) => new(false, false, true, message); public static PlayBillingResult Cancelled(string message) => new(false, false, true, message);
public static PlayBillingResult Failed(string message) => new(false, false, false, message); public static PlayBillingResult Failed(string message) => new(false, false, false, message);
@@ -16,6 +25,9 @@ public sealed record PlayBillingResult(bool Completed, bool HasActiveSubscriptio
public sealed class UnavailablePlayBillingService : IPlayBillingService public sealed class UnavailablePlayBillingService : IPlayBillingService
{ {
public Task<IReadOnlyList<PlaySubscriptionPlan>> GetSubscriptionPlansAsync(CancellationToken cancellationToken = default) =>
Task.FromResult<IReadOnlyList<PlaySubscriptionPlan>>([]);
public Task<PlayBillingResult> RestoreAsync(CancellationToken cancellationToken = default) => public Task<PlayBillingResult> RestoreAsync(CancellationToken cancellationToken = default) =>
Task.FromResult(PlayBillingResult.Failed("Google Play Billing è disponibile solo nell'app Android installata da Google Play.")); Task.FromResult(PlayBillingResult.Failed("Google Play Billing è disponibile solo nell'app Android installata da Google Play."));
+79 -10
View File
@@ -1,4 +1,6 @@
using System.Globalization; using System.Globalization;
using System.Net;
using System.Net.Http.Headers;
using System.Xml.Linq; using System.Xml.Linq;
namespace LMEMappeCatastaliApp.Services; namespace LMEMappeCatastaliApp.Services;
@@ -13,8 +15,9 @@ public sealed class OfficialCadastreService
public OfficialCadastreService() public OfficialCadastreService()
{ {
_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2"); _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/1.0 (Android)");
_httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/gml+xml"); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/gml+xml"));
_httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml", 0.9));
} }
public async Task<string> GetParcelsNearAsync( public async Task<string> GetParcelsNearAsync(
@@ -22,14 +25,30 @@ public sealed class OfficialCadastreService
double longitude, double longitude,
double radiusMeters, double radiusMeters,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
=> await GetFeaturesNearAsync( {
var firstRadius = Math.Clamp(radiusMeters, 12, 30);
var xml = await GetFeaturesNearAsync(
latitude, latitude,
longitude, longitude,
radiusMeters, firstRadius,
"CP:CadastralParcel", "CP:CadastralParcel",
100, 100,
cancellationToken); cancellationToken);
if (firstRadius >= 30 || ContainsFeatures(xml))
{
return xml;
}
return await GetFeaturesNearAsync(
latitude,
longitude,
30,
"CP:CadastralParcel",
100,
cancellationToken);
}
public async Task<string> GetSheetsNearAsync( public async Task<string> GetSheetsNearAsync(
double latitude, double latitude,
double longitude, double longitude,
@@ -78,15 +97,65 @@ public sealed class OfficialCadastreService
var url = WfsEndpoint + "?" + string.Join("&", query.Select(item => var url = WfsEndpoint + "?" + string.Join("&", query.Select(item =>
$"{Uri.EscapeDataString(item.Key)}={Uri.EscapeDataString(item.Value)}")); $"{Uri.EscapeDataString(item.Key)}={Uri.EscapeDataString(item.Value)}"));
using var response = await _httpClient.GetAsync(url, HttpCompletionOption.ResponseContentRead, cancellationToken); for (var attempt = 0; attempt < 3; attempt++)
if (!response.IsSuccessStatusCode)
{ {
throw new HttpRequestException($"Il servizio WFS AdE ha risposto {((int)response.StatusCode)}."); try
{
using var request = new HttpRequestMessage(HttpMethod.Get, url)
{
Version = HttpVersion.Version11,
VersionPolicy = HttpVersionPolicy.RequestVersionOrLower
};
request.Headers.CacheControl = new CacheControlHeaderValue { NoCache = true };
using var response = await _httpClient.SendAsync(
request,
HttpCompletionOption.ResponseContentRead,
cancellationToken);
if (response.IsSuccessStatusCode)
{
var xml = await response.Content.ReadAsStringAsync(cancellationToken);
ThrowIfExceptionReport(xml);
return xml;
}
if (attempt < 2 && IsTransient(response.StatusCode))
{
await Task.Delay(TimeSpan.FromMilliseconds(500 * (attempt + 1)), cancellationToken);
continue;
}
throw new HttpRequestException($"Il servizio WFS AdE ha risposto {((int)response.StatusCode)}.");
}
catch (HttpRequestException) when (attempt < 2)
{
await Task.Delay(TimeSpan.FromMilliseconds(500 * (attempt + 1)), cancellationToken);
}
catch (TaskCanceledException) when (!cancellationToken.IsCancellationRequested && attempt < 2)
{
await Task.Delay(TimeSpan.FromMilliseconds(500 * (attempt + 1)), cancellationToken);
}
} }
var xml = await response.Content.ReadAsStringAsync(cancellationToken); throw new HttpRequestException("Il servizio WFS AdE non ha risposto dopo tre tentativi.");
ThrowIfExceptionReport(xml); }
return xml;
private static bool IsTransient(HttpStatusCode statusCode) =>
statusCode is HttpStatusCode.RequestTimeout or HttpStatusCode.TooManyRequests
|| (int)statusCode >= 500;
private static bool ContainsFeatures(string xml)
{
try
{
var document = XDocument.Parse(xml);
return document.Descendants().Any(element =>
element.Name.LocalName is "member" or "featureMember");
}
catch (System.Xml.XmlException)
{
return false;
}
} }
private static string Format(double value) => value.ToString("R", CultureInfo.InvariantCulture); private static string Format(double value) => value.ToString("R", CultureInfo.InvariantCulture);
@@ -0,0 +1,87 @@
using System.Net.Http.Json;
using System.Reflection;
namespace LMEMappeCatastaliApp.Services;
public sealed class PlayPurchaseVerificationService
{
private const string EndpointMetadataKey = "PlayBillingVerificationUrl";
private const string RequiredMetadataKey = "PlayBillingVerificationRequired";
private readonly HttpClient _httpClient = new() { Timeout = TimeSpan.FromSeconds(20) };
public bool IsConfigured => VerificationEndpoint is not null;
public bool IsRequired => ReadMetadata(RequiredMetadataKey).Equals("true", StringComparison.OrdinalIgnoreCase);
private static Uri? VerificationEndpoint
{
get
{
var value = ReadMetadata(EndpointMetadataKey);
return Uri.TryCreate(value, UriKind.Absolute, out var endpoint)
&& endpoint.Scheme == Uri.UriSchemeHttps
? endpoint
: null;
}
}
public async Task<PlayPurchaseVerificationResult> VerifyAsync(
string purchaseToken,
CancellationToken cancellationToken = default)
{
var endpoint = VerificationEndpoint;
if (endpoint is null)
{
return PlayPurchaseVerificationResult.NotConfigured();
}
try
{
using var response = await _httpClient.PostAsJsonAsync(endpoint, new
{
packageName = AppInfo.Current.PackageName,
productId = EntitlementService.ProductId,
purchaseToken
}, cancellationToken);
if (!response.IsSuccessStatusCode)
{
return PlayPurchaseVerificationResult.Failed(
$"Verifica acquisto non disponibile ({(int)response.StatusCode}).");
}
var result = await response.Content.ReadFromJsonAsync<VerificationResponse>(cancellationToken);
return result is null
? PlayPurchaseVerificationResult.Failed("Risposta di verifica acquisto non valida.")
: new(true, true, result.Active, result.ExpiresAt, result.Message ?? string.Empty);
}
catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
{
return PlayPurchaseVerificationResult.Failed("Il server di verifica acquisti non ha risposto in tempo.");
}
catch (Exception error)
{
return PlayPurchaseVerificationResult.Failed(
$"Verifica acquisto non disponibile: {error.GetBaseException().Message}");
}
}
private static string ReadMetadata(string key) =>
typeof(PlayPurchaseVerificationService).Assembly
.GetCustomAttributes<AssemblyMetadataAttribute>()
.FirstOrDefault(attribute => attribute.Key == key)?.Value?.Trim() ?? string.Empty;
private sealed record VerificationResponse(bool Active, DateTimeOffset? ExpiresAt, string? Message);
}
public sealed record PlayPurchaseVerificationResult(
bool Configured,
bool Verified,
bool Active,
DateTimeOffset? ExpiresAt,
string Message)
{
public static PlayPurchaseVerificationResult NotConfigured() =>
new(false, false, false, null, "Server di verifica acquisti non configurato.");
public static PlayPurchaseVerificationResult Failed(string message) =>
new(true, false, false, null, message);
}
+1
View File
@@ -61,6 +61,7 @@ try {
-c $Configuration ` -c $Configuration `
-p:AndroidSdkDirectory=$androidSdk ` -p:AndroidSdkDirectory=$androidSdk `
-p:AndroidPackageFormat=$format ` -p:AndroidPackageFormat=$format `
-p:RunAOTCompilation=false `
-p:AndroidKeyStore=true ` -p:AndroidKeyStore=true `
-p:AndroidSigningKeyStore=$keyStore ` -p:AndroidSigningKeyStore=$keyStore `
-p:AndroidSigningKeyAlias=lme-pro-test ` -p:AndroidSigningKeyAlias=lme-pro-test `
+30
View File
@@ -0,0 +1,30 @@
# Google Play Store assets
## Ready to upload
- `play-store-icon-512.png`: app icon, 512 x 512 px, PNG.
- `feature-graphic-1024x500.png`: feature graphic, 1024 x 500 px, PNG.
- `phone-01-map-1920x1080.png`: real app map view, landscape 16:9.
- `phone-02-data-drawings-1920x1080.png`: real data and drawing tools, landscape 16:9.
- `phone-03-projects-1920x1080.png`: real project archive, landscape 16:9.
The screenshots were captured from the Windows build, whose map and responsive panels match the Android app. The Windows title bar has been removed and the real app view is presented inside a 16:9 Store graphic.
## Optional Android replacements
For a later production listing, the Windows captures can be replaced with Android phone captures:
1. `phone-01-map.png`: main map with cadastral layer and one selected parcel.
2. `phone-02-project-tools.png`: project or data-and-drawings panel with useful content visible.
3. `phone-03-gps.png`: map with GPS position or a short track, without showing a private address.
4. `phone-04-export.png`: import/export tools or project archive.
Use portrait orientation and keep every image between 320 px and 3840 px per side. Do not include personal coordinates, credentials, license codes, notifications, or system dialogs.
## Store text
Short description:
`Mappe catastali, GPS, misure, progetti GIS, importazione e backup WebDAV.`
The complete Italian description is recorded in `PLAY_STORE_PRO_CHECKLIST.md` and can be pasted into Play Console.
Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

+26
View File
@@ -5,6 +5,32 @@ internal static class Program
[STAThread] [STAThread]
private static void Main(string[] args) private static void Main(string[] args)
{ {
if (args.Length == 3 && args[0].Equals("--issue-play-review", StringComparison.OrdinalIgnoreCase))
{
if (!DateTimeOffset.TryParse(
args[2],
System.Globalization.CultureInfo.InvariantCulture,
System.Globalization.DateTimeStyles.AssumeUniversal,
out var expiresAt))
{
throw new InvalidOperationException("Scadenza non valida. Usa il formato ISO 8601.");
}
var reviewRepository = new LicenseRepository();
reviewRepository.Initialize();
var license = reviewRepository.Issue(
"Google",
"Play Review",
"livio.merola+play-review@gmail.com",
expiresAt,
"Accesso riutilizzabile per la revisione Google Play");
var outputPath = Path.GetFullPath(args[1]);
File.WriteAllText(outputPath, license.Token, new System.Text.UTF8Encoding(false));
Console.WriteLine($"Licenza di revisione creata in: {outputPath}");
Console.WriteLine($"Scadenza UTC: {license.ExpiresAtUtc:O}");
return;
}
if (args.Length == 2 && args[0].Equals("--export-key", StringComparison.OrdinalIgnoreCase)) if (args.Length == 2 && args[0].Equals("--export-key", StringComparison.OrdinalIgnoreCase))
{ {
var password = Environment.GetEnvironmentVariable("LME_LICENSE_BACKUP_PASSWORD"); var password = Environment.GetEnvironmentVariable("LME_LICENSE_BACKUP_PASSWORD");
@@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Apis.AndroidPublisher.v3" Version="1.76.0.4277" />
</ItemGroup>
</Project>
+60
View File
@@ -0,0 +1,60 @@
using Google.Apis.AndroidPublisher.v3;
using Google.Apis.Auth.OAuth2;
using Google.Apis.Services;
const string PackageName = "it.liviomerola.lmemappecatastali.pro";
const string ProductId = "lme_pro";
var builder = WebApplication.CreateBuilder(args);
builder.Services.AddSingleton(_ =>
{
var credential = GoogleCredential.GetApplicationDefault()
.CreateScoped(AndroidPublisherService.Scope.Androidpublisher);
return new AndroidPublisherService(new BaseClientService.Initializer
{
HttpClientInitializer = credential,
ApplicationName = "LME Play subscription verifier"
});
});
var app = builder.Build();
app.UseHttpsRedirection();
app.MapGet("/health", () => Results.Ok(new { status = "ok" }));
app.MapPost("/v1/google-play/subscriptions/verify", async (
VerifySubscriptionRequest request,
AndroidPublisherService publisher,
CancellationToken cancellationToken) =>
{
if (request.PackageName != PackageName || request.ProductId != ProductId
|| string.IsNullOrWhiteSpace(request.PurchaseToken))
{
return Results.BadRequest(new VerifySubscriptionResponse(false, null, "Richiesta non valida."));
}
try
{
var purchase = await publisher.Purchases.Subscriptionsv2
.Get(PackageName, request.PurchaseToken)
.ExecuteAsync(cancellationToken);
var active = purchase.SubscriptionState is "SUBSCRIPTION_STATE_ACTIVE"
or "SUBSCRIPTION_STATE_IN_GRACE_PERIOD";
var expiresAt = purchase.LineItems?
.Select(item => item.ExpiryTimeDateTimeOffset)
.Where(value => value.HasValue)
.Max();
return Results.Ok(new VerifySubscriptionResponse(
active,
expiresAt,
active ? "Abbonamento LME Pro verificato." : "L'abbonamento Google Play non risulta attivo."));
}
catch (Google.GoogleApiException error) when ((int)error.HttpStatusCode is 400 or 404)
{
return Results.Ok(new VerifySubscriptionResponse(false, null, "Acquisto Google Play non riconosciuto."));
}
});
app.Run();
internal sealed record VerifySubscriptionRequest(string PackageName, string ProductId, string PurchaseToken);
internal sealed record VerifySubscriptionResponse(bool Active, DateTimeOffset? ExpiresAt, string Message);
+18
View File
@@ -0,0 +1,18 @@
# LME Play verifier
Servizio HTTPS per verificare i token degli abbonamenti `lme_pro` con la Google Play Developer API.
## Configurazione
1. Creare un service account in Google Cloud e concedergli nella Play Console il permesso di visualizzare ordini e abbonamenti dell'app.
2. Conservare il JSON del service account solo sul server.
3. Impostare `GOOGLE_APPLICATION_CREDENTIALS` con il percorso assoluto del JSON.
4. Pubblicare il servizio dietro HTTPS.
5. Compilare l'app con:
```powershell
-p:PlayBillingVerificationUrl=https://example.test/v1/google-play/subscriptions/verify
-p:PlayBillingVerificationRequired=true
```
Non inserire il JSON del service account, token di acquisto o credenziali nel repository o nell'AAB.
+173
View File
@@ -0,0 +1,173 @@
from pathlib import Path
from PIL import Image, ImageDraw, ImageFont
ROOT = Path(__file__).resolve().parents[1]
OUTPUT = ROOT / "store-assets"
GREEN = "#075E54"
GREEN_LIGHT = "#83B6A5"
ORANGE = "#F97316"
INK = "#18342F"
PAPER = "#F7FAF5"
LINE = "#BCD3CB"
BLUE = "#DCEAF0"
def font(size: int, semibold: bool = False) -> ImageFont.FreeTypeFont:
name = "seguisb.ttf" if semibold else "segoeui.ttf"
return ImageFont.truetype(str(Path("C:/Windows/Fonts") / name), size)
def draw_mark(draw: ImageDraw.ImageDraw, box: tuple[int, int, int, int]) -> None:
left, top, right, bottom = box
width = right - left
height = bottom - top
map_points = [
(left + 0.04 * width, top + 0.30 * height),
(left + 0.32 * width, top + 0.18 * height),
(left + 0.64 * width, top + 0.30 * height),
(left + 0.94 * width, top + 0.18 * height),
(left + 0.94 * width, top + 0.76 * height),
(left + 0.64 * width, top + 0.88 * height),
(left + 0.32 * width, top + 0.76 * height),
(left + 0.04 * width, top + 0.88 * height),
]
draw.polygon(map_points, fill=PAPER, outline="#E1ECE5", width=max(4, width // 38))
draw.line(
[(left + 0.32 * width, top + 0.18 * height), (left + 0.32 * width, top + 0.76 * height)],
fill=GREEN_LIGHT,
width=max(4, width // 35),
)
draw.line(
[(left + 0.64 * width, top + 0.30 * height), (left + 0.64 * width, top + 0.88 * height)],
fill=GREEN_LIGHT,
width=max(4, width // 35),
)
cx = left + 0.50 * width
cy = top + 0.36 * height
radius = 0.20 * width
pin = [
(cx, cy + radius * 1.72),
(cx - radius * 0.86, cy + radius * 0.20),
(cx - radius, cy - radius * 0.18),
(cx - radius * 0.72, cy - radius * 0.72),
(cx - radius * 0.22, cy - radius),
(cx + radius * 0.22, cy - radius),
(cx + radius * 0.72, cy - radius * 0.72),
(cx + radius, cy - radius * 0.18),
(cx + radius * 0.86, cy + radius * 0.20),
]
draw.polygon(pin, fill=ORANGE)
draw.ellipse(
(cx - radius, cy - radius, cx + radius, cy + radius),
fill=ORANGE,
outline="white",
width=max(5, width // 32),
)
hole = radius * 0.34
draw.ellipse((cx - hole, cy - hole, cx + hole, cy + hole), fill="white")
def create_icon() -> None:
image = Image.new("RGB", (512, 512), GREEN)
draw = ImageDraw.Draw(image)
draw_mark(draw, (82, 78, 430, 434))
image.save(OUTPUT / "play-store-icon-512.png", optimize=True)
def create_feature_graphic() -> None:
image = Image.new("RGB", (1024, 500), "#F3F7F5")
draw = ImageDraw.Draw(image)
draw.rectangle((0, 0, 20, 500), fill=GREEN)
draw.rectangle((20, 0, 32, 500), fill=ORANGE)
draw.text((78, 107), "LME", font=font(34, True), fill=ORANGE)
draw.text((78, 154), "Mappe Catastali Pro", font=font(55, True), fill=INK)
draw.text((80, 234), "Mappe, GPS e progetti GIS", font=font(27), fill=GREEN)
draw.line((80, 290, 455, 290), fill=LINE, width=3)
draw.text((80, 315), "Consulta • misura • organizza", font=font(21), fill="#46635D")
panel = (595, 48, 965, 452)
draw.rounded_rectangle(panel, radius=8, fill="white", outline=LINE, width=3)
draw.polygon([(618, 86), (760, 65), (802, 164), (664, 190)], fill=BLUE, outline=GREEN_LIGHT)
draw.polygon([(806, 75), (940, 110), (923, 236), (784, 205)], fill="#E9EFE7", outline=GREEN_LIGHT)
draw.polygon([(625, 210), (779, 184), (817, 318), (665, 351)], fill="#F4E9D9", outline=GREEN_LIGHT)
draw.polygon([(820, 232), (929, 256), (946, 394), (853, 420), (798, 336)], fill=BLUE, outline=GREEN_LIGHT)
for x1, y1, x2, y2 in [
(630, 128, 932, 327),
(646, 310, 915, 128),
(704, 73, 857, 422),
(607, 267, 948, 181),
]:
draw.line((x1, y1, x2, y2), fill="#A4BDB5", width=3)
draw_mark(draw, (706, 136, 883, 340))
image.save(OUTPUT / "feature-graphic-1024x500.png", optimize=True)
def create_store_screenshot(raw_name: str, output_name: str, title: str, subtitle: str) -> None:
raw = Image.open(OUTPUT / raw_name).convert("RGB")
# Remove the Windows title bar and the desktop-only watermark/status area.
app_view = raw.crop((0, 32, raw.width, min(raw.height, 500)))
max_width, max_height = 1840, 760
scale = min(max_width / app_view.width, max_height / app_view.height)
app_view = app_view.resize(
(round(app_view.width * scale), round(app_view.height * scale)),
Image.Resampling.LANCZOS,
)
image = Image.new("RGB", (1920, 1080), "#F3F7F5")
draw = ImageDraw.Draw(image)
draw.rectangle((0, 0, 24, 1080), fill=GREEN)
draw.rectangle((24, 0, 38, 1080), fill=ORANGE)
draw.text((88, 54), title, font=font(52, True), fill=INK)
draw.text((90, 126), subtitle, font=font(26), fill="#46635D")
x = (1920 - app_view.width) // 2
y = 270
draw.rounded_rectangle(
(x - 8, y - 8, x + app_view.width + 8, y + app_view.height + 8),
radius=8,
fill="white",
outline=LINE,
width=4,
)
image.paste(app_view, (x, y))
image.save(OUTPUT / output_name, optimize=True)
def main() -> None:
OUTPUT.mkdir(exist_ok=True)
create_icon()
create_feature_graphic()
screenshots = [
(
"windows-map-raw.jpg",
"phone-01-map-1920x1080.png",
"Mappe catastali e cartografia",
"Consulta il territorio, cerca localita e lavora sulla mappa.",
),
(
"windows-data-drawings-raw.jpg",
"phone-02-data-drawings-1920x1080.png",
"Importa dati e disegna",
"KML, KMZ e GeoJSON insieme a misure e strumenti GIS.",
),
(
"windows-projects-raw.jpg",
"phone-03-projects-1920x1080.png",
"Organizza i tuoi progetti",
"Salva, riapri e condividi il lavoro sul campo.",
),
]
for raw_name, output_name, title, subtitle in screenshots:
if (OUTPUT / raw_name).exists():
create_store_screenshot(raw_name, output_name, title, subtitle)
if __name__ == "__main__":
main()
+161 -14
View File
@@ -122,10 +122,14 @@ input[type="checkbox"] {
align-items: baseline; align-items: baseline;
gap: 10px; gap: 10px;
min-width: 0; min-width: 0;
overflow: hidden;
} }
.app-identity strong { .app-identity strong {
min-width: 0;
overflow: hidden;
font-size: 18px; font-size: 18px;
text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
@@ -263,7 +267,7 @@ input[type="checkbox"] {
left: auto; left: auto;
bottom: calc(var(--nav-height) + 8px); bottom: calc(var(--nav-height) + 8px);
z-index: 1080; z-index: 1080;
display: grid; display: block;
box-sizing: border-box; box-sizing: border-box;
width: min(480px, 50vw); width: min(480px, 50vw);
overflow-y: auto; overflow-y: auto;
@@ -295,10 +299,10 @@ input[type="checkbox"] {
.map-layer-option { .map-layer-option {
display: flex; display: flex;
align-items: center; align-items: flex-start;
gap: 9px; gap: 9px;
min-height: 45px; min-height: 45px;
padding: 6px 4px; padding: 9px 4px;
border-bottom: 1px solid #e5eaed; border-bottom: 1px solid #e5eaed;
} }
@@ -306,11 +310,19 @@ input[type="checkbox"] {
flex: 0 0 auto; flex: 0 0 auto;
width: 19px; width: 19px;
height: 19px; height: 19px;
margin-top: 2px;
} }
.map-layer-option span { .map-layer-option span {
display: grid; display: grid;
gap: 2px; gap: 2px;
min-width: 0;
line-height: 1.25;
}
.map-layer-option strong,
.map-layer-option small {
overflow-wrap: anywhere;
} }
.map-layer-option small { .map-layer-option small {
@@ -1233,6 +1245,41 @@ input[type="checkbox"] {
transition: top 140ms ease; transition: top 140ms ease;
} }
.gps-overlay.is-collapsed {
grid-template-columns: auto;
right: auto;
width: 48px;
max-width: 48px;
padding: 5px;
}
.gps-overlay.is-collapsed .gps-state,
.gps-overlay.is-collapsed .gps-actions {
display: none;
}
.fiducial-list {
display: grid;
gap: 8px;
}
.fiducial-item {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
align-items: center;
gap: 10px;
padding: 10px 0;
border-bottom: 1px solid #d9e0e3;
}
.fiducial-item strong {
overflow-wrap: anywhere;
}
.fiducial-item .secondary-command {
margin: 0;
}
.gps-overlay.search-open { .gps-overlay.search-open {
top: 140px; top: 140px;
} }
@@ -1255,8 +1302,14 @@ input[type="checkbox"] {
color: #a33227; color: #a33227;
} }
.gps-actions {
display: grid;
gap: 5px;
}
.gps-main, .gps-main,
.gps-center { .gps-center,
.gps-collapse {
min-height: 38px; min-height: 38px;
padding: 0 10px; padding: 0 10px;
white-space: nowrap; white-space: nowrap;
@@ -1267,6 +1320,15 @@ input[type="checkbox"] {
color: var(--ink); color: var(--ink);
} }
.gps-collapse {
width: 38px;
padding: 0;
background: #e7ecef;
color: var(--ink);
font-size: 22px;
line-height: 1;
}
.leaflet-top.leaflet-right { .leaflet-top.leaflet-right {
top: 68px; top: 68px;
right: 2px; right: 2px;
@@ -1281,6 +1343,21 @@ input[type="checkbox"] {
height: 38px; height: 38px;
} }
.cadastral-sheet-label {
width: auto !important;
height: auto !important;
border: 1px solid #9a5b00;
border-radius: 4px;
padding: 3px 6px;
background: rgba(255, 251, 235, 0.94);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.28);
color: #713f12;
font-size: 11px;
font-weight: 800;
line-height: 1.2;
white-space: nowrap;
}
.lme-drawing-scope-actions a[aria-disabled="true"] { .lme-drawing-scope-actions a[aria-disabled="true"] {
opacity: 0.45; opacity: 0.45;
pointer-events: none; pointer-events: none;
@@ -1295,6 +1372,8 @@ input[type="checkbox"] {
z-index: 1100; z-index: 1100;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: 0;
overflow: hidden;
width: min(430px, calc(100% - 48px)); width: min(430px, calc(100% - 48px));
border-left: 1px solid var(--line); border-left: 1px solid var(--line);
background: var(--panel); background: var(--panel);
@@ -1347,10 +1426,15 @@ h2 {
} }
.panel-content { .panel-content {
flex: 1 1 auto;
min-height: 0;
display: grid; display: grid;
align-content: start;
gap: 12px; gap: 12px;
overflow-y: auto; overflow-y: auto;
padding: 15px 16px 24px; overscroll-behavior: contain;
padding: 15px 16px max(32px, calc(24px + env(safe-area-inset-bottom)));
scroll-padding-bottom: max(32px, calc(24px + env(safe-area-inset-bottom)));
} }
.panel-section { .panel-section {
@@ -1547,11 +1631,36 @@ label {
z-index: 820; z-index: 820;
max-width: min(620px, calc(100% - 460px)); max-width: min(620px, calc(100% - 460px));
border-radius: 8px; border-radius: 8px;
padding: 9px 11px; display: flex;
align-items: flex-start;
gap: 8px;
padding: 7px 7px 7px 11px;
background: rgba(22, 31, 38, 0.88); background: rgba(22, 31, 38, 0.88);
color: #fff; color: #fff;
font-size: 12px; font-size: 12px;
pointer-events: none; pointer-events: auto;
}
.map-info[hidden] {
display: none;
}
.map-info-text {
min-width: 0;
padding: 2px 0;
overflow-wrap: anywhere;
}
.map-info-close {
flex: 0 0 28px;
width: 28px;
min-height: 28px;
padding: 0;
border: 0;
background: transparent;
color: #fff;
font-size: 20px;
line-height: 1;
} }
.wms-preview[hidden] { .wms-preview[hidden] {
@@ -1731,7 +1840,16 @@ footer {
right: 8px; right: 8px;
left: auto; left: auto;
bottom: calc(var(--nav-height) + 8px); bottom: calc(var(--nav-height) + 8px);
width: 50vw; width: calc(100vw - 16px);
}
.map-stage.layers-open .gps-overlay {
visibility: hidden;
pointer-events: none;
}
.app-status-line {
display: none;
} }
.map-navigation-menu { .map-navigation-menu {
@@ -1788,13 +1906,19 @@ footer {
top: 136px; top: 136px;
} }
.gps-overlay.is-collapsed {
right: auto;
width: 48px;
max-width: 48px;
}
.leaflet-top.leaflet-right { .leaflet-top.leaflet-right {
top: 122px; top: 174px;
right: 0; right: 0;
} }
.map-stage.search-active .leaflet-top.leaflet-right { .map-stage.search-active .leaflet-top.leaflet-right {
top: 190px; top: 242px;
} }
.gps-main, .gps-main,
@@ -1805,12 +1929,19 @@ footer {
.map-info { .map-info {
right: 8px; right: 8px;
bottom: 72px; bottom: calc(var(--nav-height) + 116px);
left: 8px; left: 8px;
max-width: none; max-width: none;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; line-height: 1.35;
white-space: nowrap; white-space: normal;
}
.map-info-text {
display: -webkit-box;
overflow: hidden;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
} }
.bottom-tabs button { .bottom-tabs button {
@@ -1832,8 +1963,24 @@ footer {
min-width: 0; min-width: 0;
} }
.gps-overlay {
grid-template-columns: minmax(0, 1fr) auto auto;
}
.gps-overlay.is-collapsed {
grid-template-columns: auto;
right: auto;
width: 48px;
max-width: 48px;
}
.fiducial-item {
grid-template-columns: minmax(0, 1fr);
}
.gps-main,
.gps-center { .gps-center {
display: none; min-width: 86px;
} }
.bottom-tabs button { .bottom-tabs button {
+410 -28
View File
@@ -9,13 +9,20 @@ const lmeState = {
"gpsTrail", "gpsTrail",
"gpsParcels", "gpsParcels",
"selectedParcels", "selectedParcels",
"fiducials",
"importedSheets", "importedSheets",
"imported", "imported",
"cadastre" "cadastre"
], ],
cadastre: null, cadastre: null,
cadastreZoning: null,
cadastreLayers: ["CP.CadastralParcel", "codice_plla", "CP.CadastralZoning", "fabbricati"], cadastreLayers: ["CP.CadastralParcel", "codice_plla", "CP.CadastralZoning", "fabbricati"],
cadastreOpacity: 0.75, cadastreOpacity: 0.75,
navigationSheetLayer: null,
navigationSheetFeature: null,
navigationSheetLabel: null,
navigationSheetRefreshTimer: null,
navigationSheetRequestId: 0,
imported: null, imported: null,
importedVisible: true, importedVisible: true,
importedSheets: null, importedSheets: null,
@@ -44,12 +51,17 @@ const lmeState = {
gpsTrail: null, gpsTrail: null,
selectedParcelsLayer: null, selectedParcelsLayer: null,
selectedParcelsVisible: true, selectedParcelsVisible: true,
fiducials: null,
fiducialsVisible: true,
fiducialColor: "#dc2626",
gpsParcelLayer: null, gpsParcelLayer: null,
gpsTrailEnabled: false, gpsTrailEnabled: false,
gpsTrailPoints: [], gpsTrailPoints: [],
gpsTrailStartedAt: null, gpsTrailStartedAt: null,
gpsWatchId: null, gpsWatchId: null,
lastPosition: null, lastPosition: null,
infoTimeoutSeconds: 3,
infoTimer: null,
fileImportBound: false, fileImportBound: false,
resizeBound: false, resizeBound: false,
googleMapsLoading: null, googleMapsLoading: null,
@@ -96,7 +108,9 @@ const lmeState = {
culture: "it-IT", culture: "it-IT",
measurementSystem: "metric", measurementSystem: "metric",
entitlements: { entitlements: {
advancedGeometry: false advancedGeometry: false,
maxDrawingObjects: 15,
drawingLimitMessage: "Hai raggiunto il limite di 15 oggetti del piano Base."
}, },
labels: { labels: {
measureArea: "Misura area", measureArea: "Misura area",
@@ -121,6 +135,10 @@ window.lmeMap = {
closeCadastrePreview, closeCadastrePreview,
clearSelectedParcels, clearSelectedParcels,
setSelectedParcelsVisible, setSelectedParcelsVisible,
setFiducialPoints,
setFiducialPointsVisible,
setFiducialColor,
fitFiducialPoints,
clearMapElements, clearMapElements,
fitImported, fitImported,
clearImported, clearImported,
@@ -183,7 +201,9 @@ window.lmeMap = {
setLocalization, setLocalization,
setEntitlements, setEntitlements,
importExternalGisFile, importExternalGisFile,
showInfo: setInfo showInfo: setInfo,
hideInfo,
setInfoTimeout
}; };
function setLocalization(options = {}) { function setLocalization(options = {}) {
@@ -213,6 +233,20 @@ function requireProFeature(feature) {
return false; return false;
} }
function drawingObjectCount() {
return lmeState.drawings ? managedRecordsForCategory("drawings").length : 0;
}
function canAddDrawingObjects(amount = 1) {
const configuredMaximum = lmeState.entitlements?.maxDrawingObjects;
if (configuredMaximum === null || configuredMaximum === undefined || configuredMaximum === "") return true;
const maximum = Number(configuredMaximum);
if (!Number.isFinite(maximum) || maximum < 0) return true;
if (drawingObjectCount() + Math.max(0, Number(amount) || 0) <= maximum) return true;
setInfo(lmeState.entitlements?.drawingLimitMessage || `Limite di ${maximum} oggetti raggiunto.`);
return false;
}
function init(dotNetReference) { function init(dotNetReference) {
if (dotNetReference) { if (dotNetReference) {
lmeState.dotNetReference = dotNetReference; lmeState.dotNetReference = dotNetReference;
@@ -284,7 +318,15 @@ function init(dotNetReference) {
lmeState.importedMeasurements = L.layerGroup().addTo(lmeState.map); lmeState.importedMeasurements = L.layerGroup().addTo(lmeState.map);
lmeState.drawingMeasurements = L.layerGroup().addTo(lmeState.map); lmeState.drawingMeasurements = L.layerGroup().addTo(lmeState.map);
lmeState.selectedParcelsLayer = L.featureGroup().addTo(lmeState.map); lmeState.selectedParcelsLayer = L.featureGroup().addTo(lmeState.map);
lmeState.fiducials = L.featureGroup().addTo(lmeState.map);
lmeState.gpsParcelLayer = L.featureGroup().addTo(lmeState.map); lmeState.gpsParcelLayer = L.featureGroup().addTo(lmeState.map);
const navigationSheetPane = lmeState.map.createPane("navigationSheetPane");
navigationSheetPane.style.zIndex = "465";
navigationSheetPane.style.pointerEvents = "none";
const cadastreZoningPane = lmeState.map.createPane("cadastreZoningPane");
cadastreZoningPane.style.zIndex = "455";
cadastreZoningPane.style.pointerEvents = "none";
lmeState.navigationSheetLayer = L.layerGroup().addTo(lmeState.map);
lmeState.gpsTrail = L.polyline([], { lmeState.gpsTrail = L.polyline([], {
pane: "gpsTrailPane", pane: "gpsTrailPane",
color: "#f97316", color: "#f97316",
@@ -319,6 +361,7 @@ function init(dotNetReference) {
lmeState.map.on("moveend", () => { lmeState.map.on("moveend", () => {
void updateAzureAttribution(); void updateAzureAttribution();
scheduleMeasurementRefresh(); scheduleMeasurementRefresh();
scheduleNavigationSheetRefresh();
}); });
document.getElementById("closeWmsPreview")?.addEventListener("click", closeCadastrePreview); document.getElementById("closeWmsPreview")?.addEventListener("click", closeCadastrePreview);
@@ -1063,12 +1106,13 @@ function normalizeKmlFiles(files) {
const parcelSet = new Set(parcels); const parcelSet = new Set(parcels);
const sheetParts = polygonParts.filter(feature => !parcelSet.has(feature)); const sheetParts = polygonParts.filter(feature => !parcelSet.has(feature));
const nonPolygonFeatures = features.filter(feature => geometryPolygons(feature.geometry).length === 0); const nonPolygonFeatures = features.filter(feature => geometryPolygons(feature.geometry).length === 0);
const optionalFeatures = [...sheetParts, ...nonPolygonFeatures]; const importedFeatures = [...parcels, ...nonPolygonFeatures];
if (!parcels.length && !(lmeState.includeKmlSheetLayer && optionalFeatures.length)) { const optionalFeatures = sheetParts;
if (!importedFeatures.length && !(lmeState.includeKmlSheetLayer && optionalFeatures.length)) {
throw new Error("nessuna particella trovata; attiva 'includi layer del foglio' per importare gli altri elementi"); throw new Error("nessuna particella trovata; attiva 'includi layer del foglio' per importare gli altri elementi");
} }
return { return {
geojson: { type: "FeatureCollection", features: parcels }, geojson: { type: "FeatureCollection", features: importedFeatures },
sheetGeojson: { sheetGeojson: {
type: "FeatureCollection", type: "FeatureCollection",
features: lmeState.includeKmlSheetLayer ? optionalFeatures : [] features: lmeState.includeKmlSheetLayer ? optionalFeatures : []
@@ -1304,6 +1348,7 @@ function managedLayerPanes() {
gpsTrail: "gpsTrailPane", gpsTrail: "gpsTrailPane",
gpsParcels: "gpsParcelsPane", gpsParcels: "gpsParcelsPane",
selectedParcels: "selectedParcelsPane", selectedParcels: "selectedParcelsPane",
fiducials: "fiducialsPane",
importedSheets: "importedSheetPane", importedSheets: "importedSheetPane",
imported: "importedPane", imported: "importedPane",
cadastre: "cadastrePane" cadastre: "cadastrePane"
@@ -1392,6 +1437,7 @@ function layerManagerCategories() {
{ key: "gpsTrail", label: "Traccia GPS", roots: [lmeState.gpsTrail].filter(Boolean) }, { key: "gpsTrail", label: "Traccia GPS", roots: [lmeState.gpsTrail].filter(Boolean) },
{ key: "gpsParcels", label: "Particella rilevata dal GPS", roots: [lmeState.gpsParcelLayer].filter(Boolean) }, { key: "gpsParcels", label: "Particella rilevata dal GPS", roots: [lmeState.gpsParcelLayer].filter(Boolean) },
{ key: "selectedParcels", label: "Particelle catastali evidenziate", roots: [lmeState.selectedParcelsLayer].filter(Boolean) }, { key: "selectedParcels", label: "Particelle catastali evidenziate", roots: [lmeState.selectedParcelsLayer].filter(Boolean) },
{ key: "fiducials", label: "Punti fiduciali", roots: [lmeState.fiducials].filter(Boolean) },
{ key: "importedSheets", label: "Cornici e fogli importati", roots: [lmeState.importedSheets].filter(Boolean), blocks: true }, { key: "importedSheets", label: "Cornici e fogli importati", roots: [lmeState.importedSheets].filter(Boolean), blocks: true },
{ key: "imported", label: "Progetti e dati importati", roots: [lmeState.imported].filter(Boolean), blocks: true }, { key: "imported", label: "Progetti e dati importati", roots: [lmeState.imported].filter(Boolean), blocks: true },
{ key: "cadastre", label: "Layer catastali AdE", roots: [lmeState.cadastre].filter(Boolean) } { key: "cadastre", label: "Layer catastali AdE", roots: [lmeState.cadastre].filter(Boolean) }
@@ -1774,6 +1820,10 @@ function moveManagedRecordsToGroup(records, targetCategory, targetSource, target
setInfo("Sblocca il gruppo prima di spostarlo."); setInfo("Sblocca il gruppo prima di spostarlo.");
return; return;
} }
const additionalDrawings = targetCategory === "drawings"
? movable.filter(record => record.categoryKey !== "drawings").length
: 0;
if (!canAddDrawingObjects(additionalDrawings)) return;
rememberMapChange(); rememberMapChange();
const features = movable.map(record => { const features = movable.map(record => {
const feature = record.layer.toGeoJSON(); const feature = record.layer.toGeoJSON();
@@ -2683,6 +2733,7 @@ function storedFeatureStyle(feature) {
function duplicateManagedRecords(records) { function duplicateManagedRecords(records) {
if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return; } if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return; }
if (records.some(record => record.layer?.feature?.properties?._lmeLocked)) { setInfo("Sblocca gli oggetti da duplicare."); return; } if (records.some(record => record.layer?.feature?.properties?._lmeLocked)) { setInfo("Sblocca gli oggetti da duplicare."); return; }
if (!canAddDrawingObjects(records.length)) return;
rememberMapChange(); rememberMapChange();
records.forEach((record, index) => { records.forEach((record, index) => {
const feature = record.layer.toGeoJSON(); const feature = record.layer.toGeoJSON();
@@ -3035,6 +3086,11 @@ function restoreLastTrashItem() {
if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return false; } if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return false; }
const entry = lmeState.trash.pop(); const entry = lmeState.trash.pop();
if (!entry) { setInfo("Il cestino e' vuoto."); return false; } if (!entry) { setInfo("Il cestino e' vuoto."); return false; }
const drawingsToRestore = entry.items.filter(item => !["imported", "importedSheets"].includes(item.categoryKey)).length;
if (!canAddDrawingObjects(drawingsToRestore)) {
lmeState.trash.push(entry);
return false;
}
rememberMapChange(); rememberMapChange();
entry.items.forEach(item => { entry.items.forEach(item => {
if (item.categoryKey === "imported") addImportedFeatures({ type: "FeatureCollection", features: [item.feature] }); if (item.categoryKey === "imported") addImportedFeatures({ type: "FeatureCollection", features: [item.feature] });
@@ -3226,6 +3282,8 @@ function setManagedCategoryVisible(category, visible) {
lmeState.importedSheetsVisible = visible; lmeState.importedSheetsVisible = visible;
} else if (category.key === "selectedParcels") { } else if (category.key === "selectedParcels") {
lmeState.selectedParcelsVisible = visible; lmeState.selectedParcelsVisible = visible;
} else if (category.key === "fiducials") {
lmeState.fiducialsVisible = visible;
} else if (category.key === "gpsPosition") { } else if (category.key === "gpsPosition") {
lmeState.gpsPositionVisible = visible; lmeState.gpsPositionVisible = visible;
} }
@@ -3299,6 +3357,9 @@ function managedCategoryEnabled(categoryKey) {
if (categoryKey === "selectedParcels") { if (categoryKey === "selectedParcels") {
return lmeState.selectedParcelsVisible; return lmeState.selectedParcelsVisible;
} }
if (categoryKey === "fiducials") {
return lmeState.fiducialsVisible;
}
return true; return true;
} }
@@ -3824,6 +3885,7 @@ function clearImported() {
} }
function addProjectMarker(name) { function addProjectMarker(name) {
if (!canAddDrawingObjects()) return false;
rememberMapChange(); rememberMapChange();
const center = lmeState.map.getCenter(); const center = lmeState.map.getCenter();
const label = (name || "Nuovo POI").trim(); const label = (name || "Nuovo POI").trim();
@@ -3839,6 +3901,7 @@ function addProjectMarker(name) {
refreshLayerManager(); refreshLayerManager();
selectDrawingLayer(marker); selectDrawingLayer(marker);
finishMapChange(); finishMapChange();
return true;
} }
function configureDrawLabels() { function configureDrawLabels() {
@@ -3867,6 +3930,7 @@ function bindDrawingEvents() {
setInfo("Il progetto e' in sola lettura."); setInfo("Il progetto e' in sola lettura.");
return; return;
} }
if (!canAddDrawingObjects()) return;
snapDrawingLayer(event.layer); snapDrawingLayer(event.layer);
annotateDrawingLayer(event.layer, event.layerType); annotateDrawingLayer(event.layer, event.layerType);
lmeState.drawings.addLayer(event.layer); lmeState.drawings.addLayer(event.layer);
@@ -4103,6 +4167,7 @@ function startMeasurementDrawing(mode) {
if (!lmeState.map) { if (!lmeState.map) {
return; return;
} }
if (!canAddDrawingObjects()) return;
bindDrawingEvents(); bindDrawingEvents();
hideDrawingScopeMenu(); hideDrawingScopeMenu();
if (lmeState.activeDrawHandler) { if (lmeState.activeDrawHandler) {
@@ -4672,7 +4737,7 @@ function circleToPolygon(center, radiusMeters) {
function createProjectSnapshot(includeCadastralParcels) { function createProjectSnapshot(includeCadastralParcels) {
const center = lmeState.map.getCenter(); const center = lmeState.map.getCenter();
return JSON.stringify({ return JSON.stringify({
schemaVersion: 5, schemaVersion: 6,
view: { view: {
latitude: center.lat, latitude: center.lat,
longitude: center.lng, longitude: center.lng,
@@ -4682,6 +4747,7 @@ function createProjectSnapshot(includeCadastralParcels) {
imported: managedGroupGeoJson(lmeState.imported, "imported"), imported: managedGroupGeoJson(lmeState.imported, "imported"),
importedSheets: managedGroupGeoJson(lmeState.importedSheets, "importedSheets"), importedSheets: managedGroupGeoJson(lmeState.importedSheets, "importedSheets"),
importedSheetsVisible: lmeState.importedSheetsVisible, importedSheetsVisible: lmeState.importedSheetsVisible,
fiducials: managedGroupGeoJson(lmeState.fiducials, "fiducials"),
displayOptions: captureDisplayOptions(), displayOptions: captureDisplayOptions(),
selectedParcels: includeCadastralParcels selectedParcels: includeCadastralParcels
? managedGroupGeoJson(lmeState.selectedParcelsLayer, "selectedParcels") ? managedGroupGeoJson(lmeState.selectedParcelsLayer, "selectedParcels")
@@ -4717,6 +4783,7 @@ function loadProjectSnapshot(raw, projectName) {
lmeState.drawingMeasurements.clearLayers(); lmeState.drawingMeasurements.clearLayers();
lmeState.importedMeasurements.clearLayers(); lmeState.importedMeasurements.clearLayers();
lmeState.selectedParcelsLayer.clearLayers(); lmeState.selectedParcelsLayer.clearLayers();
lmeState.fiducials.clearLayers();
lmeState.gpsParcelLayer.clearLayers(); lmeState.gpsParcelLayer.clearLayers();
const restoredDrawings = L.geoJSON(data.drawings || emptyFeatureCollection(), { const restoredDrawings = L.geoJSON(data.drawings || emptyFeatureCollection(), {
@@ -4777,6 +4844,10 @@ function loadProjectSnapshot(raw, projectName) {
applyStyleFromProperties(layer); applyStyleFromProperties(layer);
} }
}).addTo(lmeState.selectedParcelsLayer); }).addTo(lmeState.selectedParcelsLayer);
L.geoJSON(data.fiducials || emptyFeatureCollection(), {
pointToLayer: (feature, latlng) => createFiducialMarker(feature, latlng),
onEachFeature: (feature, layer) => bindFiducialPopup(feature, layer)
}).addTo(lmeState.fiducials);
if (lmeState.importedSheetsVisible) { if (lmeState.importedSheetsVisible) {
void ensureImportedSheetOutlines().then(() => { void ensureImportedSheetOutlines().then(() => {
applyImportedSheetVisibility(); applyImportedSheetVisibility();
@@ -4799,6 +4870,7 @@ function loadProjectSnapshot(raw, projectName) {
lmeState.drawings, lmeState.drawings,
lmeState.imported, lmeState.imported,
lmeState.selectedParcelsLayer, lmeState.selectedParcelsLayer,
lmeState.fiducials,
lmeState.gpsTrail lmeState.gpsTrail
]; ];
if (lmeState.importedSheetsVisible) { if (lmeState.importedSheetsVisible) {
@@ -4849,6 +4921,8 @@ function captureDisplayOptions() {
drawToolsVisible: Boolean(lmeState.drawControl), drawToolsVisible: Boolean(lmeState.drawControl),
gpsPositionVisible: lmeState.gpsPositionVisible, gpsPositionVisible: lmeState.gpsPositionVisible,
selectedParcelsVisible: lmeState.selectedParcelsVisible, selectedParcelsVisible: lmeState.selectedParcelsVisible,
fiducialsVisible: lmeState.fiducialsVisible,
fiducialColor: lmeState.fiducialColor,
layerOrder: [...lmeState.layerOrder], layerOrder: [...lmeState.layerOrder],
layerObjectOrder: { ...lmeState.managerObjectOrder }, layerObjectOrder: { ...lmeState.managerObjectOrder },
layerCategoryNames: { ...lmeState.managerCategoryNames }, layerCategoryNames: { ...lmeState.managerCategoryNames },
@@ -4916,6 +4990,10 @@ function applyProjectDisplayOptions(options) {
} }
setGpsPositionVisible(options.gpsPositionVisible !== false); setGpsPositionVisible(options.gpsPositionVisible !== false);
setSelectedParcelsVisible(options.selectedParcelsVisible !== false); setSelectedParcelsVisible(options.selectedParcelsVisible !== false);
if (typeof options.fiducialColor === "string") {
setFiducialColor(options.fiducialColor);
}
setFiducialPointsVisible(options.fiducialsVisible !== false);
toggleTrail(Boolean(options.trailEnabled)); toggleTrail(Boolean(options.trailEnabled));
setDrawToolsVisible(Boolean(options.drawToolsVisible)); setDrawToolsVisible(Boolean(options.drawToolsVisible));
applyStoredLayerManagerVisibility(); applyStoredLayerManagerVisibility();
@@ -5352,6 +5430,9 @@ function setCadastreOpacity(value) {
if (lmeState.cadastre) { if (lmeState.cadastre) {
lmeState.cadastre.setOpacity(lmeState.cadastreOpacity); lmeState.cadastre.setOpacity(lmeState.cadastreOpacity);
} }
if (lmeState.cadastreZoning) {
lmeState.cadastreZoning.setOpacity(Math.max(0.8, lmeState.cadastreOpacity));
}
} }
function toggleCadastreLayer(layer, enabled) { function toggleCadastreLayer(layer, enabled) {
@@ -5363,6 +5444,13 @@ function toggleCadastreLayer(layer, enabled) {
lmeState.cadastreLayers = lmeState.cadastreLayers.filter(item => item !== layer); lmeState.cadastreLayers = lmeState.cadastreLayers.filter(item => item !== layer);
} }
refreshCadastreLayer(); refreshCadastreLayer();
if (layer === "CP.CadastralZoning") {
if (enabled) {
scheduleNavigationSheetRefresh(true);
} else {
clearNavigationSheetOutline();
}
}
const layerNames = { const layerNames = {
"CP.CadastralParcel": "Confini particelle", "CP.CadastralParcel": "Confini particelle",
codice_plla: "Numeri particelle", codice_plla: "Numeri particelle",
@@ -5378,43 +5466,189 @@ function toggleCadastreLayer(layer, enabled) {
setInfo(`${layerNames[layer] || layer}: ${enabled ? "attivo" : "nascosto"}.`); setInfo(`${layerNames[layer] || layer}: ${enabled ? "attivo" : "nascosto"}.`);
} }
function scheduleNavigationSheetRefresh(immediate = false) {
window.clearTimeout(lmeState.navigationSheetRefreshTimer);
if (!lmeState.map
|| !lmeState.dotNetReference
|| !lmeState.cadastreLayers.includes("CP.CadastralZoning")) {
return;
}
if (lmeState.map.getZoom() < 15) {
clearNavigationSheetOutline();
return;
}
lmeState.navigationSheetRefreshTimer = window.setTimeout(
() => void refreshNavigationSheetOutline(),
immediate ? 0 : 650);
}
async function refreshNavigationSheetOutline() {
if (!lmeState.map
|| !lmeState.dotNetReference
|| !lmeState.cadastreLayers.includes("CP.CadastralZoning")) {
return;
}
const center = lmeState.map.getCenter();
const point = [center.lng, center.lat];
if (loadedCadastralSheetAt(point)) {
clearNavigationSheetOutline();
return;
}
if (lmeState.navigationSheetFeature?.geometry
&& geometryContainsPoint(lmeState.navigationSheetFeature.geometry, point)) {
lmeState.navigationSheetLabel?.setLatLng(center);
return;
}
const requestId = ++lmeState.navigationSheetRequestId;
try {
const xml = await lmeState.dotNetReference.invokeMethodAsync(
"GetOfficialCadastralSheetsNear",
center.lat,
center.lng);
if (requestId !== lmeState.navigationSheetRequestId
|| !lmeState.cadastreLayers.includes("CP.CadastralZoning")) {
return;
}
const candidates = gmlParcelsToGeoJson(xml).features || [];
const sheet = findContainingPolygon(point, { type: "FeatureCollection", features: candidates })
|| candidates[0];
if (!sheet) {
return;
}
const reference = String(sheet.properties?.NATIONALCADASTRALZONINGREFERENCE
|| sheet.properties?.LABEL
|| "").trim();
const previousReference = String(
lmeState.navigationSheetFeature?.properties?.NATIONALCADASTRALZONINGREFERENCE
|| lmeState.navigationSheetFeature?.properties?.LABEL
|| "").trim();
lmeState.navigationSheetFeature = sheet;
lmeState.navigationSheetLayer.clearLayers();
L.geoJSON(sheet, {
pane: "navigationSheetPane",
interactive: false,
style: {
color: "#f59e0b",
weight: 4,
opacity: 0.95,
dashArray: "10 6",
fillColor: "#fbbf24",
fillOpacity: 0.055
}
}).addTo(lmeState.navigationSheetLayer);
lmeState.navigationSheetLabel = L.marker(center, {
pane: "navigationSheetPane",
interactive: false,
icon: L.divIcon({
className: "cadastral-sheet-label",
html: escapeHtml(reference ? `Foglio ${reference}` : "Foglio catastale")
})
}).addTo(lmeState.navigationSheetLayer);
if (reference && reference !== previousReference) {
setInfo(`Confine del foglio catastale ${reference} caricato.`);
}
} catch {
if (requestId === lmeState.navigationSheetRequestId) {
setInfo("Confine del foglio catastale non disponibile dal servizio AdE. Riprovo al prossimo spostamento.");
}
}
}
function clearNavigationSheetOutline() {
window.clearTimeout(lmeState.navigationSheetRefreshTimer);
lmeState.navigationSheetRequestId++;
lmeState.navigationSheetFeature = null;
lmeState.navigationSheetLabel = null;
lmeState.navigationSheetLayer?.clearLayers();
}
function loadedCadastralSheetAt(point) {
const features = [
...(lmeState.importedSheets?.toGeoJSON?.()?.features || []),
...(lmeState.imported?.toGeoJSON?.()?.features || [])
].filter(feature => ["Polygon", "MultiPolygon"].includes(feature?.geometry?.type)
&& (feature.properties?._lmeOfficialSheet
|| feature.properties?.NATIONALCADASTRALZONINGREFERENCE
|| isSheetOrOverlayFeature(feature)));
return findContainingPolygon(point, { type: "FeatureCollection", features });
}
function refreshCadastreLayer() { function refreshCadastreLayer() {
if (lmeState.cadastre) { if (lmeState.cadastre) {
lmeState.map.removeLayer(lmeState.cadastre); lmeState.map.removeLayer(lmeState.cadastre);
} }
if (lmeState.cadastreZoning) {
const layers = activeCadastreLayers(); lmeState.map.removeLayer(lmeState.cadastreZoning);
lmeState.cadastre = null;
if (!layers.length) {
return;
} }
const cadastreLayer = L.tileLayer.wms(cadastreUrl(), { const zoningEnabled = lmeState.cadastreLayers.includes("CP.CadastralZoning");
pane: "cadastrePane", const layers = activeCadastreLayers().filter(layer => layer !== "CP.CadastralZoning");
layers: layers.join(","), lmeState.cadastre = null;
format: "image/png", lmeState.cadastreZoning = null;
transparent: true,
version: "1.1.1",
crs: cadastreCrs,
maxZoom: 22,
opacity: lmeState.cadastreOpacity,
attribution: "Agenzia delle Entrate - CC BY 4.0"
});
if (layers.length) {
const cadastreLayer = L.tileLayer.wms(cadastreUrl(), {
pane: "cadastrePane",
layers: layers.join(","),
format: "image/png",
transparent: true,
version: "1.1.1",
crs: cadastreCrs,
maxZoom: 22,
opacity: lmeState.cadastreOpacity,
attribution: "Agenzia delle Entrate - CC BY 4.0"
});
attachCadastreTileRecovery(cadastreLayer);
lmeState.cadastre = cadastreLayer.addTo(lmeState.map);
}
if (zoningEnabled) {
const zoningLayer = L.tileLayer.wms(cadastreUrl(), {
pane: "cadastreZoningPane",
layers: "CP.CadastralZoning",
format: "image/png",
transparent: true,
version: "1.1.1",
crs: cadastreCrs,
minZoom: 8,
maxZoom: 14,
opacity: Math.max(0.8, lmeState.cadastreOpacity),
attribution: "Agenzia delle Entrate - CC BY 4.0"
});
attachCadastreTileRecovery(zoningLayer);
lmeState.cadastreZoning = zoningLayer.addTo(lmeState.map);
scheduleNavigationSheetRefresh(true);
}
}
function attachCadastreTileRecovery(cadastreLayer) {
let errorShown = false; let errorShown = false;
cadastreLayer.on("tileerror", () => { cadastreLayer.on("tileerror", event => {
const tile = event?.tile;
const retryCount = Number(tile?.dataset?.lmeRetry || 0);
if (tile && retryCount < 2) {
tile.dataset.lmeRetry = String(retryCount + 1);
window.setTimeout(() => {
const separator = tile.src.includes("?") ? "&" : "?";
tile.src = `${tile.src}${separator}_lme_retry=${Date.now()}`;
}, 450 * (retryCount + 1));
return;
}
if (errorShown) { if (errorShown) {
return; return;
} }
errorShown = true; errorShown = true;
setInfo("Layer catastali non caricati dal servizio AdE. Controlla la connessione e riprova."); setInfo("Il servizio cartografico AdE non ha risposto. La connessione internet puo essere attiva: attendi qualche secondo e riprova.");
}); });
cadastreLayer.on("load", () => { cadastreLayer.on("load", () => {
errorShown = false; errorShown = false;
}); });
lmeState.cadastre = cadastreLayer.addTo(lmeState.map);
} }
function activeCadastreLayers() { function activeCadastreLayers() {
@@ -5429,6 +5663,116 @@ function activeCadastreLayers() {
return drawOrder.filter(layer => lmeState.cadastreLayers.includes(layer)); return drawOrder.filter(layer => lmeState.cadastreLayers.includes(layer));
} }
function setFiducialPoints(points, color, visible = true) {
if (!lmeState.fiducials) return;
const source = Array.isArray(points) ? points : [];
if (source.length || lmeState.fiducials.getLayers().length) rememberMapChange();
lmeState.fiducials.clearLayers();
clearManagedCategoryState("fiducials");
if (typeof color === "string" && /^#[0-9a-f]{6}$/i.test(color)) {
lmeState.fiducialColor = color;
}
source.forEach((point, index) => {
const latitude = Number(point.latitude ?? point.Latitude);
const longitude = Number(point.longitude ?? point.Longitude);
if (!Number.isFinite(latitude) || !Number.isFinite(longitude)) return;
const feature = {
type: "Feature",
geometry: { type: "Point", coordinates: [longitude, latitude] },
properties: {
name: String(point.identifier ?? point.Identifier ?? `PF ${index + 1}`),
_lmeDisplayName: String(point.identifier ?? point.Identifier ?? `PF ${index + 1}`),
_lmeSource: "Punti fiduciali georiferiti",
_lmeColor: lmeState.fiducialColor,
_lmeFillColor: lmeState.fiducialColor,
_lmeWeight: 3,
_lmeOpacity: 1,
_lmeFillOpacity: 0.72,
cadastralNorth: point.cadastralNorth ?? point.CadastralNorth ?? null,
cadastralEast: point.cadastralEast ?? point.CadastralEast ?? null,
reliability: String(point.reliability ?? point.Reliability ?? ""),
elevation: point.elevation ?? point.Elevation ?? null,
parcel: String(point.parcel ?? point.Parcel ?? ""),
updatedAt: String(point.updatedAt ?? point.UpdatedAt ?? ""),
originId: String(point.originId ?? point.OriginId ?? ""),
monographUrl: String(point.monographUrl ?? point.MonographUrl ?? "")
}
};
const marker = createFiducialMarker(feature, L.latLng(latitude, longitude));
marker.feature = feature;
bindFiducialPopup(feature, marker);
lmeState.fiducials.addLayer(marker);
});
setFiducialPointsVisible(visible);
refreshLayerManager();
if (source.length) finishMapChange();
}
function createFiducialMarker(feature, latlng) {
const properties = feature?.properties || {};
const color = properties._lmeColor || lmeState.fiducialColor;
return L.circleMarker(latlng, {
pane: "fiducialsPane",
radius: 8,
color,
fillColor: properties._lmeFillColor || color,
weight: Number(properties._lmeWeight) || 3,
opacity: Number.isFinite(Number(properties._lmeOpacity)) ? Number(properties._lmeOpacity) : 1,
fillOpacity: Number.isFinite(Number(properties._lmeFillOpacity)) ? Number(properties._lmeFillOpacity) : 0.72
});
}
function bindFiducialPopup(feature, layer) {
const properties = feature?.properties || {};
const rows = [];
if (properties.cadastralNorth != null) rows.push(`Nord/X catastale: ${escapeHtml(properties.cadastralNorth)}`);
if (properties.cadastralEast != null) rows.push(`Est/Y catastale: ${escapeHtml(properties.cadastralEast)}`);
if (properties.reliability) rows.push(`Attendibilita: ${escapeHtml(properties.reliability)}`);
if (properties.elevation != null) rows.push(`Quota: ${escapeHtml(properties.elevation)}`);
if (properties.parcel) rows.push(`Particella: ${escapeHtml(properties.parcel)}`);
const url = String(properties.monographUrl || "");
const monograph = /^https:\/\//i.test(url)
? `<p><a href="${escapeHtml(url)}" target="_blank" rel="noopener">Apri monografia ufficiale</a></p>`
: "";
layer.bindPopup(`<strong>${escapeHtml(properties._lmeDisplayName || properties.name || "Punto fiduciale")}</strong><p>${rows.join("<br>")}</p>${monograph}<small>Posizione cartografica sperimentale GloboGIS: verificare prima dell'uso topografico.</small>`);
applyStyleFromProperties(layer);
}
function setFiducialPointsVisible(enabled) {
lmeState.fiducialsVisible = Boolean(enabled);
if (!lmeState.map || !lmeState.fiducials) return;
if (lmeState.fiducialsVisible) {
lmeState.managerHiddenCategories.delete("fiducials");
if (!lmeState.map.hasLayer(lmeState.fiducials)) lmeState.fiducials.addTo(lmeState.map);
lmeState.fiducials.bringToFront?.();
} else {
lmeState.managerHiddenCategories.add("fiducials");
if (lmeState.map.hasLayer(lmeState.fiducials)) lmeState.map.removeLayer(lmeState.fiducials);
}
refreshLayerManager();
}
function setFiducialColor(color) {
if (!/^#[0-9a-f]{6}$/i.test(String(color))) return;
lmeState.fiducialColor = color;
lmeState.fiducials?.eachLayer(layer => {
if (layer.feature?.properties) {
layer.feature.properties._lmeColor = color;
layer.feature.properties._lmeFillColor = color;
}
applyStyleFromProperties(layer);
});
refreshLayerManager();
}
function fitFiducialPoints() {
if (!lmeState.fiducials?.getLayers().length) {
setInfo("Nessun Punto Fiduciale da inquadrare.");
return;
}
fitLayer(lmeState.fiducials);
}
function clearSelectedParcels() { function clearSelectedParcels() {
const count = managedGroupGeoJson(lmeState.selectedParcelsLayer, "selectedParcels").features.length; const count = managedGroupGeoJson(lmeState.selectedParcelsLayer, "selectedParcels").features.length;
if (count) rememberMapChange(); if (count) rememberMapChange();
@@ -5467,6 +5811,7 @@ function setSelectedParcelsVisible(enabled) {
function clearMapElements() { function clearMapElements() {
const count = managedGroupGeoJson(lmeState.selectedParcelsLayer, "selectedParcels").features.length const count = managedGroupGeoJson(lmeState.selectedParcelsLayer, "selectedParcels").features.length
+ managedGroupGeoJson(lmeState.gpsParcelLayer, "gpsParcels").features.length + managedGroupGeoJson(lmeState.gpsParcelLayer, "gpsParcels").features.length
+ managedGroupGeoJson(lmeState.fiducials, "fiducials").features.length
+ managedGroupGeoJson(lmeState.imported, "imported").features.length + managedGroupGeoJson(lmeState.imported, "imported").features.length
+ managedGroupGeoJson(lmeState.importedSheets, "importedSheets").features.length + managedGroupGeoJson(lmeState.importedSheets, "importedSheets").features.length
+ managedGroupGeoJson(lmeState.drawings, "drawings").features.length + managedGroupGeoJson(lmeState.drawings, "drawings").features.length
@@ -5475,7 +5820,7 @@ function clearMapElements() {
setInfo("La mappa non contiene elementi da pulire."); setInfo("La mappa non contiene elementi da pulire.");
return; return;
} }
if (!window.confirm("Rimuovere particelle evidenziate, file importati, disegni, POI e traccia GPS dalla mappa?")) { if (!window.confirm("Rimuovere particelle evidenziate, Punti Fiduciali, file importati, disegni, POI e traccia GPS dalla mappa?")) {
return; return;
} }
@@ -5483,6 +5828,7 @@ function clearMapElements() {
resetLayerManagerProjectState(); resetLayerManagerProjectState();
lmeState.selectedParcelsLayer.clearLayers(); lmeState.selectedParcelsLayer.clearLayers();
lmeState.gpsParcelLayer.clearLayers(); lmeState.gpsParcelLayer.clearLayers();
lmeState.fiducials.clearLayers();
lmeState.imported.clearLayers(); lmeState.imported.clearLayers();
lmeState.importedSheets.clearLayers(); lmeState.importedSheets.clearLayers();
lmeState.drawings.clearLayers(); lmeState.drawings.clearLayers();
@@ -5606,6 +5952,12 @@ function onGpsPosition(position) {
updateGpsPositionLayers(latlng, lmeState.lastAccuracy); updateGpsPositionLayers(latlng, lmeState.lastAccuracy);
if (firstLiveFix) { if (firstLiveFix) {
lmeState.map.setView(latlng, 19); lmeState.map.setView(latlng, 19);
} else if (!lmeState.map.getBounds().contains(latlng)) {
lmeState.map.panTo(latlng, {
animate: true,
duration: 0.5,
easeLinearity: 0.25
});
} }
if (lmeState.gpsTrailEnabled) { if (lmeState.gpsTrailEnabled) {
@@ -5735,6 +6087,7 @@ function bearingToCardinal(value) {
function saveGpsMeasurementPoint() { function saveGpsMeasurementPoint() {
if (!lmeState.lastPosition) { setInfo("Attendi una posizione GPS valida."); return; } if (!lmeState.lastPosition) { setInfo("Attendi una posizione GPS valida."); return; }
if (!canAddDrawingObjects()) return;
rememberMapChange(); rememberMapChange();
const now = new Date(); const now = new Date();
addDrawingFeature({ type: "Feature", properties: { addDrawingFeature({ type: "Feature", properties: {
@@ -5867,7 +6220,36 @@ function cadastreUrl() {
} }
function setInfo(text) { function setInfo(text) {
setText("mapInfo", text); const container = document.getElementById("mapInfo");
if (!container) return;
setText("mapInfoText", text);
container.hidden = false;
if (lmeState.infoTimer) {
window.clearTimeout(lmeState.infoTimer);
lmeState.infoTimer = null;
}
if (lmeState.infoTimeoutSeconds > 0) {
lmeState.infoTimer = window.setTimeout(hideInfo, lmeState.infoTimeoutSeconds * 1000);
}
}
function hideInfo() {
const container = document.getElementById("mapInfo");
if (container) container.hidden = true;
if (lmeState.infoTimer) {
window.clearTimeout(lmeState.infoTimer);
lmeState.infoTimer = null;
}
}
function setInfoTimeout(seconds) {
const value = Number(seconds);
lmeState.infoTimeoutSeconds = Number.isFinite(value) ? Math.min(30, Math.max(0, value)) : 3;
const container = document.getElementById("mapInfo");
if (container && !container.hidden) {
setInfo(document.getElementById("mapInfoText")?.textContent || "");
}
} }
function setText(id, text) { function setText(id, text) {