Compare commits

..
21 Commits
Author SHA1 Message Date
livio f1224b21c4 Aggiunge spostamento tra gruppi 0.4.2 2026-09-25 08:59:38 +02:00
livio eb5f51795b Migliora layer e persistenza nomi 0.4.1 2026-09-25 08:25:25 +02:00
livio 205a520708 Rilascia gestione completa progetti e aggiornamenti 0.4.0 2026-09-24 17:21:25 +02:00
livio 620a4bec26 Rilascia strumenti avanzati e archivio 0.3.0 2026-09-24 16:15:23 +02:00
livio b19afbce91 Scegli ambito per modifica ed eliminazione 2026-09-24 14:42:39 +02:00
livio 28a982abed Modifica ed elimina il disegno selezionato 2026-09-24 14:20:46 +02:00
livio 0ffcc7ae31 Distingui visivamente la gerarchia dei layer 2026-09-24 09:21:08 +02:00
livio bb30f23d67 Riorganizza verticalmente il pannello layer 2026-09-24 09:04:13 +02:00
livio 87304b1568 Rimuovi oggetti e gruppi dal progetto 2026-09-24 08:50:31 +02:00
livio a23eff6124 Rinomina ed evidenzia i gruppi mappa 2026-09-24 08:38:07 +02:00
livio 4da47a8835 Consenti di rinominare gli oggetti mappa 2026-09-24 08:15:58 +02:00
livio fc303e2555 Separa le misure per ogni oggetto 2026-09-22 16:56:17 +02:00
livio 49ed7d5f0e Mantieni aperto il gestore livelli al refresh 2026-09-22 16:15:12 +02:00
livio 3856a9f675 Correggi deselezione oggetti mappa 2026-09-22 16:01:35 +02:00
livio e1bb7d9320 Correggi visibilità oggetti durante refresh GPS 2026-09-22 15:47:54 +02:00
livio f1bbd53634 Aggiungi gestore gerarchico livelli mappa 2026-09-22 15:26:56 +02:00
livio 708f539c64 Persist map flags and toggle selected parcels 2026-09-22 14:43:27 +02:00
livio e93dd9b867 Generate missing imported sheet outline 2026-09-22 10:47:35 +02:00
livio a9b1d74983 Fix imported sheet layer visibility 2026-09-22 10:25:51 +02:00
livio c093d88677 Separate projects and export tabs 2026-09-22 08:56:59 +02:00
livio 78af860493 Fix KMZ overlays and add map export 2026-09-22 08:43:23 +02:00
16 changed files with 5841 additions and 191 deletions

No files matched your search

File diff suppressed because it is too large. Load diff
+4 -3
View File
@@ -28,8 +28,9 @@
<ApplicationId>com.companyname.lmemappecatastaliapp</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>0.2.12</ApplicationDisplayVersion>
<ApplicationVersion>16</ApplicationVersion>
<ApplicationDisplayVersion>0.4.2</ApplicationDisplayVersion>
<ApplicationVersion>37</ApplicationVersion>
<Version>$(ApplicationDisplayVersion)</Version>
<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
<WindowsPackageType>None</WindowsPackageType>
@@ -44,7 +45,7 @@
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#075E54" />
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+3
View File
@@ -23,6 +23,9 @@ public static class MauiProgram
builder.Services.AddSingleton<NetworkLocationService>();
builder.Services.AddSingleton<AzureMapsService>();
builder.Services.AddSingleton<ProjectStorageService>();
builder.Services.AddSingleton<MapExportService>();
builder.Services.AddSingleton<CloudSyncService>();
builder.Services.AddSingleton<AppUpdateService>();
#if DEBUG
builder.Services.AddBlazorWebViewDeveloperTools();
+44 -4
View File
@@ -2,7 +2,45 @@
App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata per consultare mappe catastali e lavorare sul campo con GPS.
## Funzioni gia implementate
## Versione 0.4.2
- Nuovo comando `Sposta nel gruppo` visibile accanto a Rinomina e Rimuovi per padri, sottogruppi e singoli oggetti.
- Scelta della categoria e del sottogruppo di destinazione, con possibilita di creare un nuovo gruppo.
- I disegni possono essere organizzati in sottogruppi come i dati importati.
- `Sposta geometria` resta separato e continua a traslare gli oggetti in metri verso nord, sud, est o ovest.
## Versione 0.4.1
- Pannelli operativi allineati a destra, con ricerca lasciata nella posizione precedente.
- Espansione della gerarchia Layer esclusivamente tramite freccia accanto alla maniglia di trascinamento.
- Colori coerenti tra gruppo padre e figli, intensita progressiva per livello e conteggio figli in grassetto.
- Spostamento dei gruppi tra `Disegni e POI` e `Progetti e dati importati`.
- Rinomine persistenti nei progetti e negli export GeoJSON, KML e KMZ.
- Gli oggetti e i gruppi rimossi dal progetto non vengono piu inclusi nei salvataggi e negli export.
- Editor interni per rinomina, attributi multilinea, coordinate, spostamento e buffer.
- Selezione multipla e blocco disponibili anche nella tabella oggetti e particelle.
- Evidenziazione nel Layer dell'oggetto selezionato sulla mappa e centratura automatica opzionale, disattivata per impostazione predefinita.
- Strumenti controllo/riparazione, foro e confronto nella barra Leaflet, con risultati visibili in una finestra dedicata.
- Comandi del pannello Progetti disposti verticalmente senza scorrimento orizzontale.
## Versione 0.4.0
La mappa ora occupa tutta la schermata: il pannello `Layer` resta subito accessibile, mentre ricerca, catasto, dati, progetti, esportazione, strumenti avanzati e impostazioni sono raccolti nel menu in alto.
Tra le funzioni principali della versione 0.4.0:
- rinomina, ordinamento, selezione, blocco e rimozione reversibile di singoli oggetti e gruppi;
- evidenziazione coordinata dei gruppi e gerarchia visiva tra padri, figli e livelli annidati;
- annulla/ripristina, cestino, storico modifiche, autosalvataggio e backup programmati;
- modifica o eliminazione del solo disegno selezionato oppure di tutti i disegni;
- tabella oggetti, ricerca, attributi personalizzati, etichette, note e foto;
- strumenti geometrici per buffer, unione, divisione, fori, confronto e controllo/riparazione;
- importazione controllata di GeoJSON, KML e KMZ con analisi, pulizia e deduplicazione;
- cache cartografica offline, sincronizzazione WebDAV e condivisione di progetti modificabili o in sola lettura;
- controllo aggiornamenti da Gitea con versione installata, versione disponibile, note e download APK;
- esportazione PDF con schema vettoriale, freccia nord, scala grafica e riferimenti catastali.
## Funzioni implementate
- Mappa interattiva Leaflet con sfondi Esri, OpenStreetMap, OpenTopoMap, CARTO Voyager, Google Maps e Azure Maps configurabili tramite chiave.
- Layer WMS ufficiale Agenzia delle Entrate: particelle, numeri particella, fogli, fabbricati, strade e acque.
@@ -11,12 +49,14 @@ App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata pe
- Import di file KML, KMZ, GeoJSON e JSON.
- Import GeoJSON compatibile con BOM, geometrie singole, array, FeatureCollection e coordinate Web Mercator EPSG:3857.
- Filtro KML/KMZ `solo particelle` attivo per impostazione predefinita, con separazione dei MultiPolygon ed esclusione di GroundOverlay e perimetri del foglio; il layer foglio resta importabile e puo essere mostrato o nascosto separatamente.
- Migrazione automatica dei vecchi progetti: i GroundOverlay `DOC_...` salvati in precedenza insieme alle particelle vengono riconosciuti, separati e nascosti in tempo reale dal relativo check.
- Inquadramento e pulizia dei layer importati.
- Disegno di marker, linee, poligoni e rettangoli.
- Area, Distanza e Cerchio disponibili nella barra Leaflet laterale, nascosta all'avvio e controllata dal pulsante nel tab Dati insieme agli altri strumenti.
- Area, Distanza e Cerchio disponibili nella barra Leaflet laterale, nascosta all'avvio e controllata dalla sezione `Dati e disegni` insieme agli altri strumenti.
- Misure permanenti attivabili anche sui layer importati da KML, KMZ e GeoJSON.
- Toolbar di disegno completa di icone, modifica, eliminazione singola e pulizia di tutti i disegni/POI.
- Archivio multiprogetto nella cartella privata dell'app, con nome, selezione da elenco, sovrascrittura ed eliminazione.
- Sezioni `Progetti` ed `Esporta` nel menu: la prima gestisce archivio e opzioni live di visualizzazione, la seconda esporta selettivamente l'intera mappa in GeoJSON, KML o KMZ.
- Ogni progetto salva file GIS, POI, disegni, traccia, inquadratura e tutte le opzioni di visualizzazione: sfondo, layer catastali, trasparenza, misure, foglio importato, barra strumenti e preferenze GPS.
- GPS nativo MAUI ad alta precisione con permessi Android/iOS.
- Centratura automatica una tantum all'apertura: prima tramite posizione approssimativa della connessione Internet, poi tramite singola lettura GPS se la rete non restituisce una posizione; nessun punto o cerchio viene mostrato e il tracking continuo non viene avviato.
@@ -24,13 +64,13 @@ App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata pe
- Marker posizione, cerchio accuratezza in metri, tracciamento percorso.
- Controllo se la posizione GPS cade dentro un poligono importato o disegnato.
- Interrogazione WFS ufficiale Agenzia delle Entrate attorno alla posizione GPS per evidenziare la particella catastale corrente quando il servizio restituisce la geometria.
- Mappa a tutto schermo con tab separati Catasto, Dati, Progetti e Impostazioni, adattabile agli schermi pieghevoli.
- Mappa a tutto schermo con menu compatto e pannelli adattabili a telefoni, tablet e schermi pieghevoli.
- Ingrandimento oltre lo zoom satellitare nativo senza tessere "Map data not yet available".
- Tendine concatenate Regione, Comune, Foglio e Particella.
- Ricerca di localita e indirizzi eseguita nativamente con fallback Esri e OpenStreetMap, senza richieste CORS dalla WebView.
- Catalogo dei Comuni incluso nell'APK e cataloghi regionali OnData scaricati in cache solo quando servono.
- Ricerca catastale eseguita dal codice .NET nativo, senza DuckDB WebAssembly nella WebView Android.
- La registrazione della traccia GPS e' disattivata all'avvio; la toolbar di disegno completa puo' essere mostrata o nascosta dal tab Dati.
- La registrazione della traccia GPS e' disattivata all'avvio; la toolbar di disegno completa puo' essere mostrata o nascosta dalla sezione `Dati e disegni`.
- Pannello `Layer` accessibile direttamente dalla mappa, con checkbox sincronizzati per confini, numeri particella, fogli, fabbricati, strade e acque.
- Le particelle cercate possono essere aggiunte una dopo l'altra, mantenendo contemporaneamente sulla mappa tutti i confini selezionati.
- Comandi separati per rimuovere le particelle selezionate o pulire importazioni, disegni, POI e traccia GPS.
+4 -4
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
<rect x="0" y="0" width="456" height="456" fill="#512BD4" />
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="456" height="456" viewBox="0 0 456 456" xmlns="http://www.w3.org/2000/svg">
<rect width="456" height="456" fill="#075E54" />
</svg>

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 187 B

+13 -8
View File
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="456" height="456" viewBox="0 0 456 456" xmlns="http://www.w3.org/2000/svg">
<g stroke-linecap="round" stroke-linejoin="round">
<path d="M105 150L183 119L273 151L351 120V307L273 338L183 306L105 337Z"
fill="#F7FAF5" stroke="#E1ECE5" stroke-width="10" />
<path d="M183 119V306M273 151V338" fill="none" stroke="#83B6A5" stroke-width="10" />
<path d="M125 190L162 175M124 274L160 260M293 196L330 181M295 282L330 268"
fill="none" stroke="#A9CDBE" stroke-width="9" />
<path d="M228 104C188 104 157 135 157 175C157 225 228 294 228 294C228 294 299 225 299 175C299 135 268 104 228 104Z"
fill="#F97316" stroke="#FFFFFF" stroke-width="12" />
<circle cx="228" cy="175" r="24" fill="#FFFFFF" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 834 B

+44
View File
@@ -0,0 +1,44 @@
using System.Net.Http.Json;
using System.Reflection;
using System.Text.Json.Serialization;
namespace LMEMappeCatastaliApp.Services;
public sealed class AppUpdateService
{
private const string LatestReleaseUrl = "https://gitea.lmcloud.it/api/v1/repos/livio/LMEMappeCatastaliApp/releases/latest";
private readonly HttpClient _httpClient = new() { Timeout = TimeSpan.FromSeconds(20) };
public static string CurrentVersion =>
typeof(AppUpdateService).Assembly
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
.InformationalVersion.Split('+')[0]
?? AppInfo.Current.VersionString;
public async Task<AppUpdateResult> CheckAsync(CancellationToken cancellationToken = default)
{
var release = await _httpClient.GetFromJsonAsync<GiteaRelease>(LatestReleaseUrl, cancellationToken)
?? throw new InvalidDataException("Risposta aggiornamenti non valida.");
var latestText = (release.TagName ?? string.Empty).TrimStart('v', 'V');
_ = Version.TryParse(CurrentVersion, out var current);
_ = Version.TryParse(latestText, out var latest);
var apk = release.Assets?.FirstOrDefault(item => item.Name?.EndsWith(".apk", StringComparison.OrdinalIgnoreCase) == true);
return new(latest is not null && current is not null && latest > current, latestText, release.HtmlUrl ?? string.Empty, apk?.BrowserDownloadUrl ?? release.HtmlUrl ?? string.Empty, release.Body ?? string.Empty);
}
private sealed class GiteaRelease
{
[JsonPropertyName("tag_name")] public string? TagName { get; set; }
[JsonPropertyName("html_url")] public string? HtmlUrl { get; set; }
[JsonPropertyName("assets")] public GiteaAsset[]? Assets { get; set; }
[JsonPropertyName("body")] public string? Body { get; set; }
}
private sealed class GiteaAsset
{
[JsonPropertyName("name")] public string? Name { get; set; }
[JsonPropertyName("browser_download_url")] public string? BrowserDownloadUrl { get; set; }
}
}
public sealed record AppUpdateResult(bool IsAvailable, string Version, string ReleaseUrl, string DownloadUrl, string ReleaseNotes);
+1 -1
View File
@@ -13,7 +13,7 @@ public sealed class AzureMapsService
public AzureMapsService()
{
_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.12");
_httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
_httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/json");
}
+54
View File
@@ -0,0 +1,54 @@
using System.Net.Http.Headers;
using System.Text;
namespace LMEMappeCatastaliApp.Services;
public sealed class CloudSyncService
{
private readonly HttpClient _httpClient = new() { Timeout = TimeSpan.FromMinutes(3) };
public async Task UploadAsync(string endpoint, string userName, string password, string localPath, CancellationToken cancellationToken = default)
{
var target = BuildTarget(endpoint);
using var request = new HttpRequestMessage(HttpMethod.Put, target);
ApplyCredentials(request, userName, password);
request.Content = new StreamContent(File.OpenRead(localPath));
request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/zip");
using var response = await _httpClient.SendAsync(request, cancellationToken);
response.EnsureSuccessStatusCode();
}
public async Task<string> DownloadAsync(string endpoint, string userName, string password, CancellationToken cancellationToken = default)
{
using var request = new HttpRequestMessage(HttpMethod.Get, BuildTarget(endpoint));
ApplyCredentials(request, userName, password);
using var response = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
response.EnsureSuccessStatusCode();
var directory = Path.Combine(FileSystem.CacheDirectory, "CloudSync");
Directory.CreateDirectory(directory);
var path = Path.Combine(directory, $"LME-cloud-{DateTime.Now:yyyyMMdd-HHmmss}.lmebackup.zip");
await using var input = await response.Content.ReadAsStreamAsync(cancellationToken);
await using var output = File.Create(path);
await input.CopyToAsync(output, cancellationToken);
return path;
}
private static Uri BuildTarget(string endpoint)
{
if (!Uri.TryCreate(endpoint?.Trim(), UriKind.Absolute, out var uri)
|| (uri.Scheme != Uri.UriSchemeHttps && uri.Scheme != Uri.UriSchemeHttp))
{
throw new ArgumentException("Inserisci un indirizzo WebDAV http o https valido.");
}
return uri.AbsolutePath.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)
? uri
: new Uri($"{uri.ToString().TrimEnd('/')}/LMEMappeCatastali-sync.lmebackup.zip");
}
private static void ApplyCredentials(HttpRequestMessage request, string userName, string password)
{
if (string.IsNullOrWhiteSpace(userName)) return;
var value = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{userName}:{password}"));
request.Headers.Authorization = new AuthenticationHeaderValue("Basic", value);
}
}
+475
View File
@@ -0,0 +1,475 @@
using System.Globalization;
using System.IO.Compression;
using System.Text;
using System.Text.Json;
using System.Xml.Linq;
namespace LMEMappeCatastaliApp.Services;
public sealed class MapExportService
{
private static readonly XNamespace Kml = "http://www.opengis.net/kml/2.2";
public async Task<MapExportFile> CreateAsync(
string requestedName,
string requestedFormat,
string geoJson,
CancellationToken cancellationToken = default)
{
using var document = JsonDocument.Parse(geoJson);
var root = document.RootElement;
if (!root.TryGetProperty("type", out var type) || type.GetString() != "FeatureCollection"
|| !root.TryGetProperty("features", out var features)
|| features.ValueKind != JsonValueKind.Array)
{
throw new InvalidDataException("I dati raccolti dalla mappa non sono validi.");
}
var featureCount = features.GetArrayLength();
if (featureCount == 0)
{
throw new InvalidOperationException("Nessun oggetto selezionato e disponibile da esportare.");
}
var format = requestedFormat.Trim().ToLowerInvariant() switch
{
"kml" => "kml",
"kmz" => "kmz",
"gpx" => "gpx",
"pdf" => "pdf",
_ => "geojson"
};
var baseName = NormalizeFileName(requestedName);
var exportDirectory = Path.Combine(FileSystem.CacheDirectory, "Exports");
Directory.CreateDirectory(exportDirectory);
var path = Path.Combine(exportDirectory, $"{baseName}.{format}");
if (format == "geojson")
{
using var output = File.Create(path);
await JsonSerializer.SerializeAsync(output, root, new JsonSerializerOptions { WriteIndented = true }, cancellationToken);
return new(path, "application/geo+json", featureCount, Path.GetFileName(path));
}
if (format == "gpx")
{
await File.WriteAllTextAsync(path, BuildGpx(features, baseName), new UTF8Encoding(false), cancellationToken);
return new(path, "application/gpx+xml", featureCount, Path.GetFileName(path));
}
if (format == "pdf")
{
await File.WriteAllBytesAsync(path, BuildPdfReport(features, baseName), cancellationToken);
return new(path, "application/pdf", featureCount, Path.GetFileName(path));
}
var kml = BuildKml(features, baseName);
if (format == "kml")
{
await File.WriteAllTextAsync(path, kml, new UTF8Encoding(false), cancellationToken);
return new(path, "application/vnd.google-earth.kml+xml", featureCount, Path.GetFileName(path));
}
await using (var output = File.Create(path))
using (var archive = new ZipArchive(output, ZipArchiveMode.Create))
{
var entry = archive.CreateEntry("doc.kml", CompressionLevel.Optimal);
await using var entryStream = entry.Open();
await using var writer = new StreamWriter(entryStream, new UTF8Encoding(false));
await writer.WriteAsync(kml.AsMemory(), cancellationToken);
}
return new(path, "application/vnd.google-earth.kmz", featureCount, Path.GetFileName(path));
}
private static string BuildGpx(JsonElement features, string name)
{
var root = new XElement("gpx",
new XAttribute("version", "1.1"),
new XAttribute("creator", "LME Mappe Catastali 0.4.2"),
new XAttribute(XNamespace.Xmlns + "xsi", "http://www.w3.org/2001/XMLSchema-instance"),
new XElement("metadata", new XElement("name", name)));
foreach (var feature in features.EnumerateArray())
{
if (!feature.TryGetProperty("geometry", out var geometry) || geometry.ValueKind != JsonValueKind.Object) continue;
var properties = feature.TryGetProperty("properties", out var value) ? value : default;
var featureName = FeatureName(properties, GetString(properties, "_lmeCategory") ?? "drawing");
var type = geometry.GetProperty("type").GetString();
var coordinates = geometry.GetProperty("coordinates");
if (type == "Point")
{
root.Add(GpxPoint("wpt", coordinates, featureName));
}
else
{
foreach (var line in EnumerateGpxLines(type, coordinates))
{
root.Add(new XElement("trk", new XElement("name", featureName),
new XElement("trkseg", line.Select(point => GpxPoint("trkpt", point, null)))));
}
}
}
return new XDocument(new XDeclaration("1.0", "utf-8", null), root).ToString();
}
private static XElement GpxPoint(string element, JsonElement coordinate, string? name)
{
var values = coordinate.EnumerateArray().ToArray();
var point = new XElement(element,
new XAttribute("lat", values[1].GetDouble().ToString("G17", CultureInfo.InvariantCulture)),
new XAttribute("lon", values[0].GetDouble().ToString("G17", CultureInfo.InvariantCulture)));
if (!string.IsNullOrWhiteSpace(name)) point.Add(new XElement("name", name));
return point;
}
private static IEnumerable<JsonElement[]> EnumerateGpxLines(string? type, JsonElement coordinates)
{
if (type == "LineString") yield return coordinates.EnumerateArray().ToArray();
else if (type == "Polygon")
foreach (var ring in coordinates.EnumerateArray()) yield return ring.EnumerateArray().ToArray();
else if (type == "MultiLineString")
foreach (var line in coordinates.EnumerateArray()) yield return line.EnumerateArray().ToArray();
else if (type == "MultiPolygon")
foreach (var polygon in coordinates.EnumerateArray())
foreach (var ring in polygon.EnumerateArray()) yield return ring.EnumerateArray().ToArray();
}
private static byte[] BuildPdfReport(JsonElement features, string title)
{
var paths = features.EnumerateArray()
.Where(feature => feature.TryGetProperty("geometry", out _))
.SelectMany(feature => PdfCoordinatePaths(feature.GetProperty("geometry")))
.Where(path => path.Count > 0)
.ToArray();
var points = paths.SelectMany(path => path).ToArray();
var minLon = points.Length == 0 ? 0 : points.Min(point => point.Lon);
var maxLon = points.Length == 0 ? 1 : points.Max(point => point.Lon);
var minLat = points.Length == 0 ? 0 : points.Min(point => point.Lat);
var maxLat = points.Length == 0 ? 1 : points.Max(point => point.Lat);
var lonSpan = Math.Max(0.0000001, maxLon - minLon);
var latSpan = Math.Max(0.0000001, maxLat - minLat);
const double mapLeft = 48, mapBottom = 438, mapWidth = 499, mapHeight = 330;
var scale = Math.Min(mapWidth / lonSpan, mapHeight / latSpan);
var drawing = new StringBuilder("0.08 0.44 0.37 RG 0.86 0.94 0.91 rg 1.4 w ");
foreach (var path in paths.Take(400))
{
for (var pointIndex = 0; pointIndex < path.Count; pointIndex++)
{
var x = mapLeft + (path[pointIndex].Lon - minLon) * scale;
var y = mapBottom + (path[pointIndex].Lat - minLat) * scale;
drawing.AppendFormat(CultureInfo.InvariantCulture, "{0:0.##} {1:0.##} {2} ", x, y, pointIndex == 0 ? "m" : "l");
}
drawing.Append("S ");
}
drawing.Append("0 0 0 RG 1 w 497 730 m 497 758 l S 497 758 m 491 746 l 503 746 l h f ");
var middleLatitude = (minLat + maxLat) / 2;
var widthMeters = lonSpan * 111_320 * Math.Cos(middleLatitude * Math.PI / 180);
var scaleMeters = Math.Max(1, NiceScaleDistance(widthMeters / 4));
var scalePixels = widthMeters <= 0 ? 80 : Math.Clamp(scaleMeters / widthMeters * mapWidth, 35, 150);
drawing.AppendFormat(CultureInfo.InvariantCulture, "48 422 m {0:0.##} 422 l S 48 418 m 48 426 l S {0:0.##} 418 m {0:0.##} 426 l S ", 48 + scalePixels);
var lines = new List<string>
{
title,
$"Rapporto LME Mappe Catastali - {DateTime.Now:dd/MM/yyyy HH:mm}",
$"Oggetti: {features.GetArrayLength()}",
$"Scala grafica: {scaleMeters:0} m | Nord: alto pagina",
""
};
var index = 1;
foreach (var feature in features.EnumerateArray())
{
var properties = feature.TryGetProperty("properties", out var value) ? value : default;
var category = GetString(properties, "_lmeCategory") ?? "drawing";
var geometry = feature.TryGetProperty("geometry", out var geo) ? geo.GetProperty("type").GetString() : "-";
var sheet = GetString(properties, "foglio") ?? GetString(properties, "FOGLIO");
var parcel = GetString(properties, "particella") ?? GetString(properties, "PARTICELLA") ?? GetString(properties, "LABEL");
var reference = string.Join(" ", new[] { sheet is null ? null : $"F.{sheet}", parcel is null ? null : $"P.{parcel}" }.Where(item => item is not null));
lines.Add($"{index++}. {FeatureName(properties, category)} [{category}, {geometry}] {reference}".TrimEnd());
}
var content = drawing.Append("BT /F1 12 Tf 48 810 Td ");
foreach (var line in lines.Take(21))
{
var safe = line.Replace("\\", "\\\\").Replace("(", "\\(").Replace(")", "\\)")
.Select(character => character <= 255 ? character : '?').ToArray();
content.Append('(').Append(safe).Append(") Tj 0 -16 Td ");
}
content.Append("ET");
var stream = Encoding.Latin1.GetBytes(content.ToString());
var objects = new[]
{
"<< /Type /Catalog /Pages 2 0 R >>",
"<< /Type /Pages /Kids [3 0 R] /Count 1 >>",
"<< /Type /Page /Parent 2 0 R /MediaBox [0 0 595 842] /Resources << /Font << /F1 5 0 R >> >> /Contents 4 0 R >>",
$"<< /Length {stream.Length} >>\nstream\n{Encoding.Latin1.GetString(stream)}\nendstream",
"<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>"
};
using var output = new MemoryStream();
using var writer = new StreamWriter(output, Encoding.Latin1, leaveOpen: true) { NewLine = "\n" };
writer.Write("%PDF-1.4\n"); writer.Flush();
var offsets = new List<long> { 0 };
for (var i = 0; i < objects.Length; i++)
{
offsets.Add(output.Position); writer.Write($"{i + 1} 0 obj\n{objects[i]}\nendobj\n"); writer.Flush();
}
var xref = output.Position;
writer.Write($"xref\n0 {objects.Length + 1}\n0000000000 65535 f \n");
foreach (var offset in offsets.Skip(1)) writer.Write($"{offset:0000000000} 00000 n \n");
writer.Write($"trailer << /Size {objects.Length + 1} /Root 1 0 R >>\nstartxref\n{xref}\n%%EOF");
writer.Flush();
return output.ToArray();
}
private static double NiceScaleDistance(double value)
{
if (value <= 0) return 1;
var power = Math.Pow(10, Math.Floor(Math.Log10(value)));
var normalized = value / power;
var nice = normalized >= 5 ? 5 : normalized >= 2 ? 2 : 1;
return nice * power;
}
private static IEnumerable<List<(double Lon, double Lat)>> PdfCoordinatePaths(JsonElement geometry)
{
if (!geometry.TryGetProperty("type", out var typeElement) || !geometry.TryGetProperty("coordinates", out var coordinates)) yield break;
var type = typeElement.GetString();
if (type == "Point") { yield return [PdfPoint(coordinates)]; yield break; }
if (type == "LineString") { yield return coordinates.EnumerateArray().Select(PdfPoint).ToList(); yield break; }
if (type == "Polygon" || type == "MultiLineString")
{
foreach (var path in coordinates.EnumerateArray()) yield return path.EnumerateArray().Select(PdfPoint).ToList();
yield break;
}
if (type == "MultiPolygon")
{
foreach (var polygon in coordinates.EnumerateArray())
foreach (var path in polygon.EnumerateArray()) yield return path.EnumerateArray().Select(PdfPoint).ToList();
}
}
private static (double Lon, double Lat) PdfPoint(JsonElement coordinate) =>
(coordinate[0].GetDouble(), coordinate[1].GetDouble());
private static string BuildKml(JsonElement features, string documentName)
{
var document = new XElement(Kml + "Document",
new XElement(Kml + "name", documentName),
BuildStyle("imported", "ff2ecc71", "402ecc71"),
BuildStyle("imported-sheet", "ff22803d", "1022803d"),
BuildStyle("cadastral", "ff4444ef", "4224bffb"),
BuildStyle("cadastral-gps", "ffff7a00", "337aff00"),
BuildStyle("drawing", "ff1679f9", "333c92fb"),
BuildStyle("poi", "ffff7a00", "33ff7a00"),
BuildStyle("gps-trail", "ff00a5ff", "2200a5ff"));
var categoryFolders = new Dictionary<string, XElement>(StringComparer.Ordinal);
var groupFolders = new Dictionary<(string Category, string Group), XElement>();
foreach (var feature in features.EnumerateArray())
{
if (!feature.TryGetProperty("geometry", out var geometry)
|| geometry.ValueKind is JsonValueKind.Null or JsonValueKind.Undefined)
{
continue;
}
var properties = feature.TryGetProperty("properties", out var propertyElement)
&& propertyElement.ValueKind == JsonValueKind.Object
? propertyElement
: default;
var category = GetString(properties, "_lmeCategory") ?? "drawing";
var placemark = new XElement(Kml + "Placemark",
new XElement(Kml + "name", FeatureName(properties, category)),
new XElement(Kml + "styleUrl", $"#{NormalizeStyleId(category)}"));
var featureStyle = BuildFeatureStyle(properties);
if (featureStyle is not null)
{
placemark.Add(featureStyle);
}
var extendedData = BuildExtendedData(properties);
if (extendedData is not null)
{
placemark.Add(extendedData);
}
placemark.Add(BuildGeometry(geometry));
var categoryName = GetString(properties, "_lmeCategoryName")?.Trim();
var groupName = GetString(properties, "_lmeGroupName")?.Trim();
var parent = document;
if (!string.IsNullOrWhiteSpace(categoryName))
{
if (!categoryFolders.TryGetValue(categoryName, out var categoryFolder))
{
categoryFolder = new XElement(Kml + "Folder", new XElement(Kml + "name", categoryName));
categoryFolders[categoryName] = categoryFolder;
document.Add(categoryFolder);
}
parent = categoryFolder;
}
if (!string.IsNullOrWhiteSpace(groupName))
{
var key = (categoryName ?? string.Empty, groupName);
if (!groupFolders.TryGetValue(key, out var groupFolder))
{
groupFolder = new XElement(Kml + "Folder", new XElement(Kml + "name", groupName));
groupFolders[key] = groupFolder;
parent.Add(groupFolder);
}
parent = groupFolder;
}
parent.Add(placemark);
}
return new XDocument(new XDeclaration("1.0", "utf-8", null), new XElement(Kml + "kml", document)).ToString();
}
private static XElement BuildStyle(string id, string lineColor, string fillColor) =>
new(Kml + "Style",
new XAttribute("id", id),
new XElement(Kml + "LineStyle",
new XElement(Kml + "color", lineColor),
new XElement(Kml + "width", 3)),
new XElement(Kml + "PolyStyle", new XElement(Kml + "color", fillColor)));
private static XElement? BuildFeatureStyle(JsonElement properties)
{
var color = GetString(properties, "_lmeColor");
var fillColor = GetString(properties, "_lmeFillColor") ?? color;
if (string.IsNullOrWhiteSpace(color) && string.IsNullOrWhiteSpace(fillColor)) return null;
var weight = GetNumber(properties, "_lmeWeight", 3);
var opacity = GetNumber(properties, "_lmeOpacity", 1);
var fillOpacity = GetNumber(properties, "_lmeFillOpacity", 0.2);
return new XElement(Kml + "Style",
new XElement(Kml + "LineStyle",
new XElement(Kml + "color", ToKmlColor(color ?? "#f97316", opacity)),
new XElement(Kml + "width", weight.ToString("0.##", CultureInfo.InvariantCulture))),
new XElement(Kml + "PolyStyle",
new XElement(Kml + "color", ToKmlColor(fillColor ?? "#fb923c", fillOpacity))));
}
private static double GetNumber(JsonElement properties, string name, double fallback) =>
properties.ValueKind == JsonValueKind.Object
&& properties.TryGetProperty(name, out var value)
&& value.ValueKind == JsonValueKind.Number
? value.GetDouble()
: fallback;
private static string ToKmlColor(string html, double opacity)
{
var value = html.TrimStart('#');
if (value.Length != 6) value = "f97316";
var alpha = (int)Math.Round(Math.Clamp(opacity, 0, 1) * 255);
return $"{alpha:x2}{value[4..6]}{value[2..4]}{value[0..2]}";
}
private static XElement? BuildExtendedData(JsonElement properties)
{
if (properties.ValueKind != JsonValueKind.Object)
{
return null;
}
var data = properties.EnumerateObject()
.Where(item => item.Name != "_lmeCategory"
&& item.Value.ValueKind is JsonValueKind.String or JsonValueKind.Number or JsonValueKind.True or JsonValueKind.False)
.Select(item => new XElement(Kml + "Data",
new XAttribute("name", item.Name),
new XElement(Kml + "value", ScalarText(item.Value))))
.ToArray();
return data.Length == 0 ? null : new XElement(Kml + "ExtendedData", data);
}
private static XElement BuildGeometry(JsonElement geometry)
{
var type = geometry.GetProperty("type").GetString();
if (type == "GeometryCollection")
{
return new XElement(Kml + "MultiGeometry",
geometry.GetProperty("geometries").EnumerateArray().Select(BuildGeometry));
}
var coordinates = geometry.GetProperty("coordinates");
return type switch
{
"Point" => new XElement(Kml + "Point", CoordinatesElement([coordinates])),
"LineString" => new XElement(Kml + "LineString", CoordinatesElement(coordinates.EnumerateArray())),
"Polygon" => BuildPolygon(coordinates),
"MultiPoint" => new XElement(Kml + "MultiGeometry",
coordinates.EnumerateArray().Select(point => new XElement(Kml + "Point", CoordinatesElement([point])))),
"MultiLineString" => new XElement(Kml + "MultiGeometry",
coordinates.EnumerateArray().Select(line => new XElement(Kml + "LineString", CoordinatesElement(line.EnumerateArray())))),
"MultiPolygon" => new XElement(Kml + "MultiGeometry", coordinates.EnumerateArray().Select(BuildPolygon)),
_ => throw new InvalidDataException($"Geometria GeoJSON non supportata: {type}.")
};
}
private static XElement BuildPolygon(JsonElement rings)
{
var ringList = rings.EnumerateArray().ToArray();
var polygon = new XElement(Kml + "Polygon");
if (ringList.Length > 0)
{
polygon.Add(new XElement(Kml + "outerBoundaryIs",
new XElement(Kml + "LinearRing", CoordinatesElement(ringList[0].EnumerateArray()))));
}
foreach (var ring in ringList.Skip(1))
{
polygon.Add(new XElement(Kml + "innerBoundaryIs",
new XElement(Kml + "LinearRing", CoordinatesElement(ring.EnumerateArray()))));
}
return polygon;
}
private static XElement CoordinatesElement(IEnumerable<JsonElement> points) =>
new(Kml + "coordinates", string.Join(" ", points.Select(FormatCoordinate)));
private static string FormatCoordinate(JsonElement coordinate)
{
var values = coordinate.EnumerateArray().Take(3)
.Select(value => value.GetDouble().ToString("G17", CultureInfo.InvariantCulture));
return string.Join(",", values);
}
private static string FeatureName(JsonElement properties, string category) =>
GetString(properties, "_lmeDisplayName")
?? GetString(properties, "name")
?? GetString(properties, "Name")
?? GetString(properties, "LABEL")
?? GetString(properties, "NATIONALCADASTRALREFERENCE")
?? category switch
{
"imported-sheet" => "Cornice o foglio importato",
"cadastral" => "Particella catastale",
"cadastral-gps" => "Particella GPS",
"poi" => "Punto di interesse",
"gps-trail" => "Traccia GPS",
_ => "Oggetto mappa"
};
private static string? GetString(JsonElement element, string name) =>
element.ValueKind == JsonValueKind.Object
&& element.TryGetProperty(name, out var value)
&& value.ValueKind == JsonValueKind.String
? value.GetString()
: null;
private static string ScalarText(JsonElement value) => value.ValueKind == JsonValueKind.String
? value.GetString() ?? string.Empty
: value.GetRawText();
private static string NormalizeStyleId(string category) => category switch
{
"imported" or "imported-sheet" or "cadastral" or "cadastral-gps" or "drawing" or "poi" or "gps-trail" => category,
_ => "drawing"
};
private static string NormalizeFileName(string requestedName)
{
var name = string.IsNullOrWhiteSpace(requestedName) ? "Mappa" : requestedName.Trim();
foreach (var invalid in Path.GetInvalidFileNameChars())
{
name = name.Replace(invalid, '_');
}
name = Path.GetFileNameWithoutExtension(name).Trim().TrimEnd('.');
return string.IsNullOrWhiteSpace(name) ? "Mappa" : name[..Math.Min(name.Length, 80)];
}
}
public sealed record MapExportFile(string Path, string MimeType, int FeatureCount, string FileName);
+1 -1
View File
@@ -13,7 +13,7 @@ public sealed class NetworkLocationService
public NetworkLocationService()
{
httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.12");
httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("LMEMappeCatastali/0.2.22");
}
public async Task<NetworkLocationSnapshot?> GetApproximateLocationAsync(
+271 -11
View File
@@ -1,5 +1,6 @@
using System.Text;
using System.Text.Json;
using System.IO.Compression;
namespace LMEMappeCatastaliApp.Services;
@@ -13,8 +14,9 @@ public sealed class ProjectStorageService
};
private string ProjectsDirectory => Path.Combine(FileSystem.AppDataDirectory, "Projects");
private string HistoryDirectory => Path.Combine(ProjectsDirectory, ".history");
public async Task<IReadOnlyList<MapProjectSummary>> GetProjectsAsync()
public async Task<IReadOnlyList<MapProjectSummary>> GetProjectsAsync(bool includeArchived = true)
{
await _gate.WaitAsync();
try
@@ -22,6 +24,7 @@ public sealed class ProjectStorageService
var files = await ReadProjectFilesAsync();
return files
.Select(item => item.Document.ToSummary())
.Where(item => includeArchived || !item.IsArchived)
.OrderByDescending(item => item.UpdatedAt)
.ThenBy(item => item.Name, StringComparer.CurrentCultureIgnoreCase)
.ToArray();
@@ -56,17 +59,32 @@ public sealed class ProjectStorageService
var now = DateTimeOffset.UtcNow;
var id = existing?.Document.Id ?? Guid.NewGuid().ToString("N");
if (existing is not null)
{
Directory.CreateDirectory(HistoryDirectory);
var revisionName = $"{id}--{existing.Document.UpdatedAt:yyyyMMddHHmmssfff}{ProjectExtension}";
File.Copy(existing.Path, Path.Combine(HistoryDirectory, revisionName), true);
PruneHistory(id, 15);
}
var document = new MapProjectDocument
{
SchemaVersion = 1,
SchemaVersion = 3,
Id = id,
Name = normalizedName,
CreatedAt = existing?.Document.CreatedAt ?? now,
UpdatedAt = now,
IncludesCadastralParcels = includesCadastralParcels,
Folder = existing?.Document.Folder ?? string.Empty,
IsArchived = existing?.Document.IsArchived ?? false,
AccessMode = existing?.Document.AccessMode ?? "editable",
Map = snapshotDocument.RootElement.Clone()
};
if (existing?.Document.AccessMode == "readonly")
{
throw new InvalidOperationException("Il progetto e' in sola lettura. Duplicalo per modificarlo.");
}
var path = existing?.Path ?? Path.Combine(ProjectsDirectory, BuildFileName(normalizedName, id));
var temporaryPath = path + ".tmp";
try
@@ -93,6 +111,194 @@ public sealed class ProjectStorageService
}
}
public async Task<MapProjectSummary> DuplicateAsync(string projectId)
{
await _gate.WaitAsync();
try
{
var files = await ReadProjectFilesAsync();
var source = files.FirstOrDefault(item => item.Document.Id == projectId)
?? throw new FileNotFoundException("Il progetto selezionato non esiste piu'.");
var usedNames = files.Select(item => item.Document.Name).ToHashSet(StringComparer.CurrentCultureIgnoreCase);
var baseName = $"{source.Document.Name} - copia";
var name = baseName;
for (var index = 2; usedNames.Contains(name); index++)
{
name = $"{baseName} {index}";
}
var now = DateTimeOffset.UtcNow;
var id = Guid.NewGuid().ToString("N");
var copy = new MapProjectDocument
{
SchemaVersion = 2,
Id = id,
Name = name,
CreatedAt = now,
UpdatedAt = now,
IncludesCadastralParcels = source.Document.IncludesCadastralParcels,
Folder = source.Document.Folder,
AccessMode = "editable",
Map = source.Document.Map.Clone()
};
var path = Path.Combine(ProjectsDirectory, BuildFileName(name, id));
await File.WriteAllTextAsync(path, JsonSerializer.Serialize(copy, _jsonOptions), new UTF8Encoding(false));
return copy.ToSummary();
}
finally { _gate.Release(); }
}
public async Task UpdateOrganizationAsync(string projectId, string? folder = null, bool? isArchived = null)
{
await _gate.WaitAsync();
try
{
var project = (await ReadProjectFilesAsync()).FirstOrDefault(item => item.Document.Id == projectId)
?? throw new FileNotFoundException("Il progetto selezionato non esiste piu'.");
project.Document.Folder = NormalizeFolder(folder ?? project.Document.Folder);
project.Document.IsArchived = isArchived ?? project.Document.IsArchived;
project.Document.UpdatedAt = DateTimeOffset.UtcNow;
await File.WriteAllTextAsync(project.Path, JsonSerializer.Serialize(project.Document, _jsonOptions), new UTF8Encoding(false));
}
finally { _gate.Release(); }
}
public async Task<IReadOnlyList<MapProjectVersion>> GetVersionsAsync(string projectId)
{
await _gate.WaitAsync();
try
{
Directory.CreateDirectory(HistoryDirectory);
var versions = new List<MapProjectVersion>();
foreach (var path in Directory.EnumerateFiles(HistoryDirectory, $"{projectId}--*{ProjectExtension}"))
{
try
{
await using var stream = File.OpenRead(path);
var document = await JsonSerializer.DeserializeAsync<MapProjectDocument>(stream, _jsonOptions);
if (document is not null)
{
versions.Add(new(Path.GetFileName(path), document.UpdatedAt));
}
}
catch (JsonException) { }
catch (IOException) { }
}
return versions.OrderByDescending(item => item.UpdatedAt).ToArray();
}
finally { _gate.Release(); }
}
public async Task<string> LoadVersionAsync(string projectId, string versionId)
{
await _gate.WaitAsync();
try
{
if (!versionId.StartsWith($"{projectId}--", StringComparison.Ordinal)
|| Path.GetFileName(versionId) != versionId)
{
throw new InvalidDataException("Revisione non valida.");
}
var path = Path.Combine(HistoryDirectory, versionId);
await using var stream = File.OpenRead(path);
var document = await JsonSerializer.DeserializeAsync<MapProjectDocument>(stream, _jsonOptions)
?? throw new InvalidDataException("Revisione non leggibile.");
return document.Map.GetRawText();
}
finally { _gate.Release(); }
}
public async Task<string> CreateBackupAsync()
{
await _gate.WaitAsync();
try
{
Directory.CreateDirectory(ProjectsDirectory);
var directory = Path.Combine(FileSystem.CacheDirectory, "Backups");
Directory.CreateDirectory(directory);
var path = Path.Combine(directory, $"LMEMappeCatastali-backup-{DateTime.Now:yyyyMMdd-HHmmss}.lmebackup.zip");
if (File.Exists(path)) File.Delete(path);
ZipFile.CreateFromDirectory(ProjectsDirectory, path, CompressionLevel.Optimal, false);
return path;
}
finally { _gate.Release(); }
}
public async Task<int> RestoreBackupAsync(string backupPath)
{
await _gate.WaitAsync();
try
{
Directory.CreateDirectory(ProjectsDirectory);
using var archive = ZipFile.OpenRead(backupPath);
var restored = 0;
foreach (var entry in archive.Entries.Where(item => item.FullName.EndsWith(ProjectExtension, StringComparison.OrdinalIgnoreCase)))
{
var fileName = Path.GetFileName(entry.FullName);
if (string.IsNullOrWhiteSpace(fileName)) continue;
var targetDirectory = entry.FullName.Contains(".history/", StringComparison.OrdinalIgnoreCase)
|| entry.FullName.Contains(".history\\", StringComparison.OrdinalIgnoreCase)
? HistoryDirectory : ProjectsDirectory;
Directory.CreateDirectory(targetDirectory);
entry.ExtractToFile(Path.Combine(targetDirectory, fileName), true);
if (targetDirectory == ProjectsDirectory) restored++;
}
return restored;
}
finally { _gate.Release(); }
}
public async Task<string> CreateProjectPackageAsync(string projectId, bool readOnly = false)
{
await _gate.WaitAsync();
try
{
var project = (await ReadProjectFilesAsync()).FirstOrDefault(item => item.Document.Id == projectId)
?? throw new FileNotFoundException("Il progetto selezionato non esiste piu'.");
var directory = Path.Combine(FileSystem.CacheDirectory, "Projects");
Directory.CreateDirectory(directory);
var mode = readOnly ? "readonly" : "editable";
var path = Path.Combine(directory, $"{Path.GetFileNameWithoutExtension(project.Path)}-{mode}{ProjectExtension}");
var package = new MapProjectDocument
{
SchemaVersion = 3,
Id = project.Document.Id,
Name = project.Document.Name,
CreatedAt = project.Document.CreatedAt,
UpdatedAt = project.Document.UpdatedAt,
IncludesCadastralParcels = project.Document.IncludesCadastralParcels,
Folder = project.Document.Folder,
IsArchived = false,
AccessMode = mode,
Map = project.Document.Map.Clone()
};
await File.WriteAllTextAsync(path, JsonSerializer.Serialize(package, _jsonOptions), new UTF8Encoding(false));
return path;
}
finally { _gate.Release(); }
}
public async Task<MapProjectSummary> ImportProjectAsync(string path)
{
await _gate.WaitAsync();
try
{
await using var stream = File.OpenRead(path);
var source = await JsonSerializer.DeserializeAsync<MapProjectDocument>(stream, _jsonOptions)
?? throw new InvalidDataException("Progetto non leggibile.");
if (source.Map.ValueKind != JsonValueKind.Object) throw new InvalidDataException("Mappa del progetto non valida.");
source.Id = Guid.NewGuid().ToString("N");
source.Name = NormalizeName(source.Name);
source.CreatedAt = source.UpdatedAt = DateTimeOffset.UtcNow;
source.IsArchived = false;
source.AccessMode = source.AccessMode == "readonly" ? "readonly" : "editable";
Directory.CreateDirectory(ProjectsDirectory);
var target = Path.Combine(ProjectsDirectory, BuildFileName(source.Name, source.Id));
await File.WriteAllTextAsync(target, JsonSerializer.Serialize(source, _jsonOptions), new UTF8Encoding(false));
return source.ToSummary();
}
finally { _gate.Release(); }
}
public async Task<string> LoadAsync(string projectId)
{
await _gate.WaitAsync();
@@ -118,6 +324,13 @@ public sealed class ProjectStorageService
.FirstOrDefault(item => item.Document.Id == projectId)
?? throw new FileNotFoundException("Il progetto selezionato non esiste piu'.");
File.Delete(project.Path);
if (Directory.Exists(HistoryDirectory))
{
foreach (var path in Directory.EnumerateFiles(HistoryDirectory, $"{projectId}--*{ProjectExtension}"))
{
File.Delete(path);
}
}
}
finally
{
@@ -125,6 +338,30 @@ public sealed class ProjectStorageService
}
}
public async Task<string> CreateScheduledBackupAsync(int keep = 10)
{
var source = await CreateBackupAsync();
var directory = Path.Combine(FileSystem.AppDataDirectory, "AutomaticBackups");
Directory.CreateDirectory(directory);
var target = Path.Combine(directory, $"LME-auto-{DateTime.Now:yyyyMMdd-HHmmss}.lmebackup.zip");
File.Copy(source, target, true);
foreach (var stale in Directory.EnumerateFiles(directory, "*.lmebackup.zip")
.OrderByDescending(File.GetLastWriteTimeUtc).Skip(Math.Clamp(keep, 2, 30)))
{
File.Delete(stale);
}
return target;
}
public DateTimeOffset? GetLatestScheduledBackupTime()
{
var directory = Path.Combine(FileSystem.AppDataDirectory, "AutomaticBackups");
if (!Directory.Exists(directory)) return null;
var latest = Directory.EnumerateFiles(directory, "*.lmebackup.zip")
.OrderByDescending(File.GetLastWriteTimeUtc).FirstOrDefault();
return latest is null ? null : File.GetLastWriteTimeUtc(latest);
}
private async Task<IReadOnlyList<ProjectFileEntry>> ReadProjectFilesAsync()
{
Directory.CreateDirectory(ProjectsDirectory);
@@ -179,19 +416,37 @@ public sealed class ProjectStorageService
return $"{safeName}--{id[..8]}{ProjectExtension}";
}
private void PruneHistory(string projectId, int keep)
{
foreach (var path in Directory.EnumerateFiles(HistoryDirectory, $"{projectId}--*{ProjectExtension}")
.OrderByDescending(File.GetLastWriteTimeUtc).Skip(keep))
{
File.Delete(path);
}
}
private static string NormalizeFolder(string value)
{
var normalized = string.Join(' ', (value ?? string.Empty).Split([' ', '\t', '\r', '\n'], StringSplitOptions.RemoveEmptyEntries));
return normalized[..Math.Min(normalized.Length, 60)];
}
private sealed record ProjectFileEntry(string Path, MapProjectDocument Document);
private sealed class MapProjectDocument
{
public int SchemaVersion { get; init; }
public string Id { get; init; } = string.Empty;
public string Name { get; init; } = string.Empty;
public DateTimeOffset CreatedAt { get; init; }
public DateTimeOffset UpdatedAt { get; init; }
public bool IncludesCadastralParcels { get; init; }
public JsonElement Map { get; init; }
public int SchemaVersion { get; set; }
public string Id { get; set; } = string.Empty;
public string Name { get; set; } = string.Empty;
public DateTimeOffset CreatedAt { get; set; }
public DateTimeOffset UpdatedAt { get; set; }
public bool IncludesCadastralParcels { get; set; }
public string Folder { get; set; } = string.Empty;
public bool IsArchived { get; set; }
public string AccessMode { get; set; } = "editable";
public JsonElement Map { get; set; }
public MapProjectSummary ToSummary() => new(Id, Name, UpdatedAt, IncludesCadastralParcels);
public MapProjectSummary ToSummary() => new(Id, Name, UpdatedAt, IncludesCadastralParcels, Folder, IsArchived, AccessMode == "readonly");
}
}
@@ -199,4 +454,9 @@ public sealed record MapProjectSummary(
string Id,
string Name,
DateTimeOffset UpdatedAt,
bool IncludesCadastralParcels);
bool IncludesCadastralParcels,
string Folder,
bool IsArchived,
bool IsReadOnly);
public sealed record MapProjectVersion(string Id, DateTimeOffset UpdatedAt);
+796 -13
View File
@@ -7,7 +7,7 @@
--accent: #14705e;
--accent-strong: #0c5749;
--warning: #a34b08;
--nav-height: 64px;
--nav-height: 0px;
}
html,
@@ -135,6 +135,71 @@ input[type="checkbox"] {
flex: 0 0 auto;
}
.map-icon-command,
.map-menu-button {
width: 38px;
min-width: 38px;
min-height: 38px;
padding: 0;
background: #fff;
color: var(--ink);
font-size: 22px;
line-height: 1;
}
.map-menu-button.is-active {
background: #ccebe3;
color: var(--accent-strong);
}
.app-status-line i {
display: inline-block;
width: 8px;
height: 8px;
margin-left: 5px;
border-radius: 50%;
background: #fbbf24;
}
.map-navigation-menu {
position: absolute;
top: 70px;
right: 12px;
left: auto;
z-index: 1150;
display: grid;
width: min(300px, calc(100vw - 24px));
max-height: calc(100vh - 84px);
overflow-y: auto;
border: 1px solid var(--line);
border-radius: 8px;
padding: 7px;
background: rgba(255, 255, 255, 0.99);
box-shadow: 0 5px 22px rgba(0, 0, 0, 0.3);
}
.map-navigation-menu > button {
min-height: 40px;
border-bottom: 1px solid #e5eaed;
border-radius: 0;
background: transparent;
color: var(--ink);
text-align: left;
}
.menu-credits {
display: grid;
gap: 3px;
padding: 10px 12px 5px;
color: var(--muted);
font-size: 10px;
line-height: 1.35;
}
.menu-credits a {
color: var(--accent-strong);
}
.layer-button.is-active {
background: #ccebe3;
color: var(--accent-strong);
@@ -176,10 +241,12 @@ input[type="checkbox"] {
position: absolute;
top: 72px;
right: 12px;
z-index: 940;
left: auto;
bottom: calc(var(--nav-height) + 8px);
z-index: 1080;
display: grid;
width: min(320px, calc(100% - 24px));
max-height: calc(100% - 152px);
box-sizing: border-box;
width: min(480px, 50vw);
overflow-y: auto;
border: 1px solid var(--line);
border-radius: 8px;
@@ -239,6 +306,694 @@ input[type="checkbox"] {
padding-top: 9px;
}
.layer-tree-section {
display: grid;
gap: 6px;
padding-top: 9px;
}
.layer-tree-section > header {
display: grid;
gap: 2px;
padding: 0 4px;
}
.layer-tree-section > header small {
color: var(--muted);
font-size: 10px;
}
.layer-manager-tree,
.layer-manager-children {
display: grid;
gap: 4px;
}
.layer-selection-toolbar {
position: sticky;
top: -9px;
z-index: 3;
display: grid;
gap: 6px;
padding: 8px 4px;
border-bottom: 1px solid var(--line);
background: rgba(255, 255, 255, 0.98);
}
.layer-selection-toolbar label,
.layer-object-tools > label:not(.layer-manager-suboption),
.layer-style-controls label {
display: grid;
gap: 3px;
font-size: 9px;
}
.layer-selection-summary {
display: flex;
align-items: center;
justify-content: space-between;
gap: 6px;
font-size: 10px;
}
.layer-selection-summary button,
.layer-batch-actions button,
.layer-compact-actions button,
.layer-object-tools > button {
min-height: 28px;
min-width: 0;
padding: 4px 6px;
font-size: 9px;
}
.layer-selection-summary button {
max-width: 48%;
}
.layer-batch-actions,
.layer-compact-actions {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 4px;
}
.layer-group-tools,
.layer-object-tools {
display: grid;
gap: 6px;
min-width: 0;
padding: 7px;
border: 1px dashed var(--layer-group-border, #cbd5da);
border-radius: 4px;
background: rgba(255, 255, 255, 0.7);
}
.layer-group-tools {
margin: 0 3px 4px;
}
.layer-group-totals {
color: var(--muted);
font-size: 9px;
}
.layer-style-controls {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 5px;
}
.layer-style-controls input,
.layer-style-controls select,
.layer-object-tools textarea {
width: 100%;
min-width: 0;
min-height: 28px;
padding: 3px;
font-size: 10px;
}
.layer-style-controls input[type="color"] {
padding: 1px;
}
.layer-photo-picker {
position: relative;
min-height: 32px;
place-items: center;
border: 1px dashed #8aa2aa;
border-radius: 4px;
}
.layer-photo-picker input {
position: absolute;
inset: 0;
opacity: 0;
}
.layer-photo-preview {
display: block;
width: 100%;
max-height: 140px;
object-fit: contain;
}
.lme-popup-photo {
display: block;
width: min(240px, 60vw);
max-height: 180px;
margin-top: 6px;
object-fit: contain;
}
.lme-permanent-label {
width: 0 !important;
height: 0 !important;
border: 0 !important;
background: transparent !important;
}
.lme-permanent-label span {
position: absolute;
transform: translate(-50%, -50%);
padding: 2px 5px;
border: 1px solid #52616c;
border-radius: 3px;
background: rgba(255, 255, 255, 0.92);
color: #17212b;
font-size: 10px;
font-weight: 800;
white-space: nowrap;
}
.lme-offline-tile {
box-sizing: border-box;
width: 256px;
height: 256px;
border: 1px solid #d8e0e3;
background-color: #f5f7f8;
}
.layer-manager-group,
.layer-manager-block,
.layer-manager-object {
border: 1px solid var(--layer-group-border, #dce3e6);
border-radius: 6px;
background: var(--layer-group-surface, #fff);
}
.layer-manager-group > summary {
background: var(--layer-group-parent, #f6f8f9);
}
.layer-manager-block > summary {
background: color-mix(in srgb, var(--layer-group-parent, #f6f8f9) 72%, white);
}
.layer-manager-object > summary {
background: color-mix(in srgb, var(--layer-group-parent, #f6f8f9) 42%, white);
}
.layer-manager-details,
.layer-group-tools {
background: color-mix(in srgb, var(--layer-group-parent, #f6f8f9) 22%, white);
}
.layer-manager-group > summary,
.layer-manager-block > summary,
.layer-manager-object > summary {
display: grid;
grid-template-columns: 28px 28px minmax(0, 1fr) 50px;
grid-template-areas:
"handle expand title count"
". . visibility moves"
". . actions moves";
align-items: start;
gap: 6px;
min-height: 38px;
padding: 4px 6px;
cursor: pointer;
list-style: none;
}
.layer-expand-button {
grid-area: expand;
grid-row: 1 / span 3;
align-self: center;
justify-self: center;
width: 28px;
min-width: 28px;
height: 28px;
min-height: 28px;
padding: 0;
border: 1px solid #cbd5da;
border-radius: 4px;
background: #fff;
color: var(--ink);
font-size: 18px;
line-height: 1;
}
.layer-manager-group > summary::-webkit-details-marker,
.layer-manager-block > summary::-webkit-details-marker,
.layer-manager-object > summary::-webkit-details-marker {
display: none;
}
.layer-drag-handle {
grid-area: handle;
width: 28px;
height: 28px;
border: 0;
border-radius: 4px;
background: #e9eef0;
color: var(--ink);
font-size: 18px;
line-height: 1;
touch-action: none;
cursor: grab;
}
.layer-row-actions {
grid-area: actions;
display: grid;
grid-template-columns: minmax(0, 1fr);
width: min(130px, 100%);
gap: 4px;
}
.layer-manager-group > summary > input,
.layer-manager-block > summary > input,
.layer-manager-object > summary > input {
grid-area: visibility;
justify-self: start;
width: 20px;
height: 20px;
margin: 1px 0;
}
.layer-rename-button,
.layer-membership-button,
.layer-remove-button {
width: 100%;
min-height: 28px;
min-width: 0;
padding: 4px;
border: 1px solid #bfd4cd;
border-radius: 4px;
background: #eef8f5;
color: var(--accent-strong);
font-size: 10px;
font-weight: 800;
line-height: 1.15;
overflow-wrap: anywhere;
}
.layer-rename-button:active {
background: #d9eee7;
}
.layer-membership-button {
border-color: #bfdbfe;
background: #eff6ff;
color: #1d4ed8;
}
.layer-membership-button:active {
background: #dbeafe;
}
.layer-remove-button {
border-color: #fecaca;
background: #fff1f2;
color: #b42318;
}
.layer-remove-button:active {
background: #ffe4e6;
}
.layer-move-buttons {
grid-area: moves;
display: inline-grid;
grid-template-columns: 24px 24px;
gap: 2px;
}
.layer-move-buttons button {
width: 24px;
height: 28px;
padding: 0;
border: 1px solid #cbd5da;
border-radius: 4px;
background: #f6f8f9;
color: var(--ink);
font-size: 16px;
font-weight: 800;
line-height: 1;
}
.layer-move-buttons button:active {
background: #dce8ec;
}
.layer-manager-title {
grid-area: title;
min-width: 0;
overflow-wrap: anywhere;
color: var(--layer-group-accent, var(--ink));
font-size: 12px;
}
.layer-manager-group > summary > .layer-manager-title {
font-size: 13px;
font-weight: 800;
}
.layer-manager-block > summary > .layer-manager-title {
font-size: 12px;
font-weight: 800;
}
.layer-manager-object > summary > .layer-manager-title {
font-size: 11px;
font-style: italic;
font-weight: 400;
}
.layer-inline-lock {
grid-area: visibility;
justify-self: center;
width: 28px;
min-width: 28px;
min-height: 24px;
margin-left: 26px;
padding: 0;
background: transparent;
color: var(--ink);
font-size: 15px;
}
.layer-inline-lock.is-locked {
background: #fff2cc;
}
.project-readonly .leaflet-draw,
.project-readonly .layer-rename-button,
.project-readonly .layer-remove-button,
.project-readonly .layer-inline-lock,
.project-readonly .layer-object-tools,
.project-readonly .layer-group-tools,
.project-readonly .layer-batch-actions {
pointer-events: none;
opacity: 0.5;
}
.lme-app-dialog {
position: absolute;
inset: 0;
z-index: 1500;
display: grid;
place-items: center;
padding: 16px;
background: rgba(15, 23, 28, 0.48);
}
.lme-app-dialog > section {
display: flex;
flex-direction: column;
width: min(820px, 96vw);
max-height: 88vh;
overflow: hidden;
border-radius: 8px;
background: #fff;
box-shadow: 0 8px 30px rgba(0, 0, 0, 0.32);
}
.lme-app-dialog header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 10px 12px;
border-bottom: 1px solid var(--line);
}
.lme-app-dialog header button {
width: 36px;
min-width: 36px;
min-height: 34px;
padding: 0;
background: #e9eef0;
color: var(--ink);
font-size: 22px;
}
.lme-app-dialog-body {
overflow: auto;
padding: 12px;
}
.object-table-wrap {
overflow: auto;
}
.object-table-wrap table {
width: 100%;
border-collapse: collapse;
font-size: 12px;
}
.object-table-wrap th,
.object-table-wrap td {
padding: 7px;
border-bottom: 1px solid var(--line);
text-align: left;
white-space: nowrap;
}
.object-table-wrap button {
width: 30px;
min-width: 30px;
min-height: 30px;
padding: 0;
}
.object-table-search,
.coordinate-result {
display: grid;
gap: 8px;
margin-bottom: 10px;
}
.release-notes {
max-height: 220px;
overflow: auto;
margin: 8px 0 0;
padding: 9px;
border: 1px solid var(--line);
border-radius: 6px;
background: #fff;
color: var(--ink);
font-family: inherit;
font-size: 11px;
white-space: pre-wrap;
}
.lme-offline-image-tile {
width: 256px;
height: 256px;
}
.layer-manager-count {
grid-area: count;
justify-self: end;
color: var(--muted);
font-size: 10px;
font-weight: 900;
}
.layer-manager-children {
margin-left: 4px;
padding: 4px 3px 5px 6px;
border-left: 2px solid var(--layer-group-border, #dce3e6);
}
.layer-manager-block > .layer-manager-children {
margin-left: 5px;
padding-left: 5px;
}
.layer-manager-object {
margin-left: 3px;
border-radius: 4px;
}
.layer-manager-object > summary {
grid-template-columns: 24px 24px minmax(0, 1fr) 46px;
gap: 4px;
padding: 3px 4px;
}
.layer-manager-object > summary > .layer-expand-button {
width: 24px;
min-width: 24px;
height: 24px;
min-height: 24px;
font-size: 15px;
}
.layer-manager-object > summary > .layer-drag-handle {
width: 24px;
height: 24px;
font-size: 15px;
}
.layer-manager-object > summary > .layer-move-buttons {
grid-template-columns: 22px 22px;
}
.layer-manager-object > summary > .layer-move-buttons button {
width: 22px;
height: 24px;
}
.layer-manager-object > summary .layer-rename-button,
.layer-manager-object > summary .layer-membership-button,
.layer-manager-object > summary .layer-remove-button {
min-height: 24px;
font-size: 9px;
}
.layer-manager-details {
display: grid;
gap: 2px;
padding: 0 6px 7px 12px;
color: var(--muted);
font-size: 10px;
}
.layer-manager-suboption {
display: grid;
grid-template-columns: 18px minmax(0, 1fr);
align-items: center;
gap: 6px;
min-height: 30px;
color: var(--ink);
font-size: 11px;
font-weight: 700;
}
.layer-manager-suboption input {
margin: 0;
}
.layer-manager-info {
display: grid;
gap: 2px;
padding: 3px 0 0 24px;
}
.layer-manager-dragging {
opacity: 0.55;
outline: 2px solid #2563eb;
}
.layer-manager-object-selected > summary {
background: #fff0fb;
box-shadow: inset 3px 0 #ff00d4;
}
.layer-manager-parent-highlighted > summary,
.layer-manager-parent-selected > summary {
background: #fff0fb;
box-shadow: inset 3px 0 #ff00d4;
}
.layer-manager-selection-path > summary {
box-shadow: inset 3px 0 #ff00d4;
}
.project-command-stack {
display: grid;
gap: 8px;
min-width: 0;
}
.project-command-stack > * {
width: 100%;
min-width: 0;
}
.lme-edit-form,
.attribute-editor,
.attribute-editor-rows {
display: grid;
gap: 12px;
}
.lme-edit-form textarea,
.attribute-editor textarea {
min-height: 82px;
resize: vertical;
white-space: pre-wrap;
}
.dialog-command-row {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 8px;
}
.attribute-editor > p {
margin: 0;
color: var(--muted);
font-size: 12px;
}
.attribute-editor-row {
display: grid;
grid-template-columns: minmax(130px, 0.8fr) minmax(180px, 2fr) 36px;
align-items: end;
gap: 8px;
padding-bottom: 10px;
border-bottom: 1px solid var(--line);
}
.attribute-editor-row > button {
width: 36px;
min-width: 36px;
min-height: 36px;
padding: 0;
background: #fff1f2;
color: #b42318;
font-size: 20px;
}
.object-table-legend {
display: flex;
flex-wrap: wrap;
gap: 6px 14px;
margin-bottom: 8px;
color: var(--muted);
font-size: 11px;
}
.object-table-wrap input[type="checkbox"] {
width: 18px;
height: 18px;
}
.geometry-result {
display: grid;
grid-template-columns: 46px minmax(0, 1fr);
align-items: center;
gap: 12px;
}
.geometry-result > span {
display: grid;
place-items: center;
width: 42px;
height: 42px;
border-radius: 50%;
background: #dcfce7;
color: #166534;
font-size: 25px;
font-weight: 900;
}
.geometry-result-warning > span { background: #fef3c7; color: #92400e; }
.geometry-result-error > span { background: #ffe4e6; color: #b42318; }
.geometry-result > p { margin: 0; line-height: 1.45; }
.lme-geometry-toolbar a {
display: grid !important;
place-items: center;
font-size: 20px !important;
font-weight: 900;
text-decoration: none;
}
.gps-overlay {
position: absolute;
top: 72px;
@@ -306,18 +1061,24 @@ input[type="checkbox"] {
height: 38px;
}
.lme-drawing-scope-actions a[aria-disabled="true"] {
opacity: 0.45;
pointer-events: none;
}
.tool-sheet {
position: absolute;
top: 0;
bottom: var(--nav-height);
left: 0;
right: 0;
left: auto;
z-index: 1100;
display: flex;
flex-direction: column;
width: min(430px, calc(100% - 48px));
border-right: 1px solid var(--line);
border-left: 1px solid var(--line);
background: var(--panel);
box-shadow: 7px 0 24px rgba(0, 0, 0, 0.24);
box-shadow: -7px 0 24px rgba(0, 0, 0, 0.24);
}
.sheet-header {
@@ -674,7 +1435,7 @@ label {
left: 0;
z-index: 1200;
display: grid;
grid-template-columns: repeat(5, minmax(0, 1fr));
grid-template-columns: repeat(6, minmax(0, 1fr));
height: var(--nav-height);
padding-bottom: env(safe-area-inset-bottom);
border-top: 1px solid #bcc7cd;
@@ -748,8 +1509,15 @@ footer {
.map-layer-panel {
top: 68px;
right: 8px;
width: min(320px, calc(100% - 16px));
max-height: calc(100% - 144px);
left: auto;
bottom: calc(var(--nav-height) + 8px);
width: 50vw;
}
.map-navigation-menu {
top: 66px;
right: 8px;
left: auto;
}
.tool-sheet {
@@ -757,11 +1525,25 @@ footer {
bottom: var(--nav-height);
width: 100%;
border-top: 1px solid var(--line);
border-right: 0;
border-left: 0;
border-radius: 8px 8px 0 0;
box-shadow: 0 -7px 24px rgba(0, 0, 0, 0.24);
}
.attribute-editor-row {
grid-template-columns: minmax(0, 1fr) 36px;
}
.attribute-editor-row > label {
grid-column: 1;
}
.attribute-editor-row > button {
grid-column: 2;
grid-row: 1 / span 2;
align-self: center;
}
.gps-overlay {
top: 68px;
right: 8px;
@@ -801,7 +1583,8 @@ footer {
}
.bottom-tabs button {
font-size: 11px;
padding: 0 2px;
font-size: 10px;
}
.wms-preview {
@@ -823,6 +1606,6 @@ footer {
}
.bottom-tabs button {
font-size: 10px;
font-size: 9px;
}
}
+1
View File
@@ -31,6 +31,7 @@
<script src="lib/googlemutant/Leaflet.GoogleMutant.js"></script>
<script src="lib/jszip/jszip.min.js"></script>
<script src="lib/togeojson/togeojson.umd.js"></script>
<script src="lib/turf/turf.min.js"></script>
<script src="js/lme-map.js"></script>
</body>
+3241 -108
View File
File diff suppressed because it is too large. Load diff
+37
View File
@@ -0,0 +1,37 @@
!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).turf={})}(this,(function(t){"use strict";function e(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=Array(e);n<e;n++)r[n]=t[n];return r}function n(t){if(Array.isArray(t))return t}function r(t,e,n){return e=l(e),function(t,e){if(e&&("object"==typeof e||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}(t,c()?Reflect.construct(e,n||[],l(t).constructor):e.apply(t,n))}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,y(r.key),r)}}function s(t,e,n){return e&&o(t.prototype,e),n&&o(t,n),Object.defineProperty(t,"prototype",{writable:!1}),t}function a(t,e){var n="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(!n){if(Array.isArray(t)||(n=_(t))||e){n&&(t=n);var r=0,i=function(){};return{s:i,n:function(){return r>=t.length?{done:!0}:{done:!1,value:t[r++]}},e:function(t){throw t},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,s=!0,a=!1;return{s:function(){n=n.call(t)},n:function(){var t=n.next();return s=t.done,t},e:function(t){a=!0,o=t},f:function(){try{s||null==n.return||n.return()}finally{if(a)throw o}}}}function u(t,e,n){return(e=y(e))in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function l(t){return l=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},l(t)}function h(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&p(t,e)}function c(){try{var t=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){})))}catch(t){}return(c=function(){return!!t})()}function f(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}function g(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function p(t,e){return p=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},p(t,e)}function v(t,e){return n(t)||function(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=n){var r,i,o,s,a=[],u=!0,l=!1;try{if(o=(n=n.call(t)).next,0===e){if(Object(n)!==n)return;u=!1}else for(;!(u=(r=o.call(n)).done)&&(a.push(r.value),a.length!==e);u=!0);}catch(t){l=!0,i=t}finally{try{if(!u&&null!=n.return&&(s=n.return(),Object(s)!==s))return}finally{if(l)throw i}}return a}}(t,e)||_(t,e)||g()}function d(t){return function(t){if(Array.isArray(t))return e(t)}(t)||f(t)||_(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function y(t){var e=function(t,e){if("object"!=typeof t||!t)return t;var n=t[Symbol.toPrimitive];if(void 0!==n){var r=n.call(t,e||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===e?String:Number)(t)}(t,"string");return"symbol"==typeof e?e:e+""}function m(t){return m="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},m(t)}function _(t,n){if(t){if("string"==typeof t)return e(t,n);var r={}.toString.call(t).slice(8,-1);return"Object"===r&&t.constructor&&(r=t.constructor.name),"Map"===r||"Set"===r?Array.from(t):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?e(t,n):void 0}}var x=6371008.8,E={centimeters:100*x,centimetres:100*x,degrees:360/(2*Math.PI),feet:3.28084*x,inches:39.37*x,kilometers:x/1e3,kilometres:x/1e3,meters:x,metres:x,miles:x/1609.344,millimeters:1e3*x,millimetres:1e3*x,nauticalmiles:x/1852,radians:1,yards:1.0936*x},k={acres:247105e-9,centimeters:1e4,centimetres:1e4,feet:10.763910417,hectares:1e-4,inches:1550.003100006,kilometers:1e-6,kilometres:1e-6,meters:1,metres:1,miles:386e-9,nauticalmiles:2.9155334959812285e-7,millimeters:1e6,millimetres:1e6,yards:1.195990046};function b(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r={type:"Feature"};return(0===Line truncated
/*!
* Copyright (c) 2019, Dane Springmeyer
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
function ta(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=[];if(mt(t,(function(t){n.push(t.coordinates)})),n.length<2)throw new Error("Must specify at least 2 geometries");var r=Rs.apply(Fs,[n[0]].concat(d(n.slice(1))));return 0===r.length?null:1===r.length?S(r[0],e.properties):R(r,e.properties)}function ea(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=JSON.stringify(n.properties||{}),i=v(t,4),o=i[0],s=i[1],a=i[2],u=i[3],l=(s+u)/2,h=(o+a)/2,c=2*e/ut([o,l],[a,l],n)*(a-o),f=2*e/ut([h,s],[h,u],n)*(u-s),g=c/2,p=2*g,d=Math.sqrt(3)/2*f,y=a-o,m=u-s,_=3/4*p,x=d,E=(y-p)/(p-g/2),k=Math.floor(E),b=(k*_-g/2-y)/2-g/2+_/2,w=Math.floor((m-d)/d),I=(m-w*d)/2,N=w*d-m>d/2;N&&(I-=d/4);for(var S=[],M=[],L=0;L<6;L++){var P=2*Math.PI/6*L;S.push(Math.cos(P)),M.push(Math.sin(P))}for(var T=[],O=0;O<=k;O++)for(var R=0;R<=w;R++){var A=O%2==1;if((0!==R||!A)&&(0!==R||!N)){var D=O*_+o-b,F=R*x+s+I;if(A&&(F-=d/2),!0===n.triangles)ra([D,F],c/2,f/2,JSON.parse(r),S,M).forEach((function(t){n.mask?ta(C([n.mask,t]))&&T.push(t):T.push(t)}));else{var q=na([D,F],c/2,f/2,JSON.parse(r),S,M);n.mask?ta(C([n.mask,q]))&&T.push(q):T.push(q)}}}return C(T)}function na(t,e,n,r,i,o){for(var s=[],a=0;a<6;a++){var u=t[0]+e*i[a],l=t[1]+n*o[a];s.push([u,l])}return s.push(s[0].slice()),S([s],r)}function ra(t,e,n,r,i,o){for(var s=[],a=0;a<6;a++){var u=[];u.push(t),u.push([t[0]+e*i[a],t[1]+n*o[a]]),u.push([t[0]+e*i[(a+1)%6],t[1]+n*o[(a+1)%6]]),u.push(t),s.push(S([u],r))}return s}function ia(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};n.mask&&!n.units&&(n.units="kilometers");for(var r=[],i=t[0],o=t[1],s=t[2],a=t[3],u=e/ut([i,o],[s,o],n)*(s-i),l=e/ut([i,o],[i,a],n)*(a-o),h=s-i,c=a-o,f=Math.floor(h/u),g=(c-Math.floor(c/l)*l)/2,p=i+(h-f*u)/2;p<=s;){for(var v=o+g;v<=a;){var d=I([p,v],n.properties);n.mask?Cn(d,n.mask)&&r.push(d):r.push(d),v+=l}p+=u}return C(r)}function oa(t,e,n){for(var r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},i=[],o=t[0],s=t[1],a=t[2],u=t[3],l=a-o,h=j(e,r.units,"degrees"),c=u-s,f=j(n,r.units,"degrees"),g=Math.floor(Math.abs(l)/h),p=Math.floor(Math.abs(c)/f),v=(c-p*f)/2,d=o+(l-g*h)/2,y=0;y<g;y++){for(var m=s+v,_=0;_<p;_++){var x=S([[[d,m],[d,m+f],[d+h,m+f],[d+h,m],[d,m]]],r.properties);r.mask?Oe(r.mask,x)&&i.push(x):i.push(x),m+=f}d+=h}return C(i)}function sa(t,e){return oa(t,e,e,arguments.length>2&&void 0!==arguments[2]?arguments[2]:{})}function aa(t,e){for(var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=[],i=e/ut([t[0],t[1]],[t[2],t[1]],n)*(t[2]-t[0]),o=e/ut([t[0],t[1]],[t[0],t[3]],n)*(t[3]-t[1]),s=0,a=t[0];a<=t[2];){for(var u=0,l=t[1];l<=t[3];){var h=null,c=null;s%2==0&&u%2==0?(h=S([[[a,l],[a,l+o],[a+i,l],[a,l]]],n.properties),c=S([[[a,l+o],[a+i,l+o],[a+i,l],[a,l+o]]],n.properties)):s%2==0&&u%2==1?(h=S([[[a,l],[a+i,l+o],[a+i,l],[a,l]]],n.properties),c=S([[[a,l],[a,l+o],[a+i,l+o],[a,l]]],n.properties)):u%2==0&&s%2==1?(h=S([[[a,l],[a,l+o],[a+i,l+o],[a,l]]],n.properties),c=S([[[a,l],[a+i,l+o],[a+i,l],[a,l]]],n.properties)):u%2==1&&s%2==1&&(h=S([[[a,l],[a,l+o],[a+i,l],[a,l]]],n.properties),c=S([[[a,l+o],[a+i,l+o],[a+i,l],[a,l+o]]],n.properties)),n.mask?(ta(C([n.mask,h]))&&r.push(h),ta(C([n.mask,c]))&&r.push(c)):(r.push(h),r.push(c)),l+=o,u++}s++,a+=i}return C(r)}
/*!
* MarchingSquaresJS
* version 1.3.3
* https://github.com/RaumZeit/MarchingSquares.js
*
* @license GNU Affero General Public License.
* Copyright (c) 2015-2019 Ronny Lorenz <ronny@tbi.univie.ac.at>
*/
function ua(t,e,n){return t<e?(n-t)/(e-t):(t-n)/(t-e)}function la(t,e,n,r){var i;return n>r&&(i=n,n=r,r=i),t<e?t<n?(n-t)/(e-t):(r-t)/(e-t):t>r?(t-r)/(t-e):(t-n)/(t-e)}function ha(t,e,n,r){return t<e?(n-t)/(e-t):(t-r)/(t-e)}function ca(t,e,n,r){return t<e?(r-t)/(e-t):(t-n)/(t-e)}function fa(){this.successCallback=null,this.verbose=!1,this.polygons=!1,this.polygons_full=!1,this.linearRing=!0,this.noQuadTree=!1,this.noFrame=!1}function ga(t,e,n,r){var i=[];return t.polygons.forEach((function(t){t.forEach((function(t){t[0]+=e,t[1]+=n})),r.linearRing&&t.push(t[0]),i.push(t)})),i}function pa(t,e,n,r){return 0===n?(t+=1,e+=r[0][1]):1===n?t+=r[0][0]:2===n?e+=r[0][1]:3===n&&(t+=r[0][0],e+=1),[t,e]}function va(t,e,n){return 0===n?t++:1===n||(2===n?e++:3===n&&(t++,e++)),[t,e]}function da(t,e,n,r,i){var o=r,s=i,a=0,u=0;if(this.x=e,this.y=n,this.lowerBound=null,this.upperBound=null,this.childA=null,this.childB=null,this.childC=null,this.childD=null,1===r&&1===i)this.lowerBound=Math.min(t[n][e],t[n][e+1],t[n+1][e+1],t[n+1][e]),this.upperBound=Math.max(t[n][e],t[n][e+1],t[n+1][e+1],t[n+1][e]);else{if(r>1){for(;0!==o;)o>>=1,a++;r===1<<a-1&&a--,o=1<<a-1}if(i>1){for(;0!==s;)s>>=1,u++;i===1<<u-1&&u--,s=1<<u-1}this.childA=new da(t,e,n,o,s),this.lowerBound=this.childA.lowerBound,this.upperBound=this.childA.upperBound,r-o>0&&(this.childB=new da(t,e+o,n,r-o,s),this.lowerBound=Math.min(this.lowerBound,this.childB.lowerBound),this.upperBound=Math.max(this.upperBound,this.childB.upperBound),i-s>0&&(this.childC=new da(t,e+o,n+s,r-o,i-s),this.lowerBound=Math.min(this.lowerBound,this.childC.lowerBound),this.upperBound=Math.max(this.upperBound,this.childC.upperBound))),i-s>0&&(this.childD=new da(t,e,n+s,o,i-s),this.lowerBound=Math.min(this.lowerBound,this.childD.lowerBound),this.upperBound=Math.max(this.upperBound,this.childD.upperBound))}}function ya(t){var e,n;if(!t)throw new Error("data is required");if(!Array.isArray(t)||!Array.isArray(t[0]))throw new Error("data must be scalar field, i.e. array of arrays");if(t.length<2)throw new Error("data must contain at least two rows");if((n=t[0].length)<2)throw new Error("data must contain at least two columns");for(e=1;e<t.length;e++){if(!Array.isArray(t[e]))throw new Error("Row "+e+" is not an array");if(t[e].length!=n)throw new Error("unequal row lengths detected, please provide a regular grid")}this.data=t,this.root=new da(t,0,0,t[0].length-1,t.length-1)}function ma(t,e,n){var r,i,o,s=!1,a=!1,u=null,l=null,h=null,c=null,f=null,g=[];if(!t)throw new Error("data is required");if(null==e)throw new Error("threshold is required");if(n&&"object"!==m(n))throw new Error("options must be an object");if(r=function(t){var e,n,r,i,o;for(i=new fa,t=t||{},o=Object.keys(i),e=0;e<o.length;e++)null!=(r=t[n=o[e]])&&(i[n]=r);return i.polygons_full=!i.polygons,i.interpolate=ua,i}(n),t instanceof ya)u=t,l=t.root,h=t.data,r.noQuadTree||(s=!0);else{if(!Array.isArray(t)||!Array.isArray(t[0]))throw new Error("input is neither array of arrays nor object retrieved from 'QuadTree()'");h=t}if(Array.isArray(e)){for(a=!0,r.noQuadTree||(s=!0),i=0;i<e.length;i++)if(isNaN(+e[i]))throw new Error("threshold["+i+"] is not a number")}else{if(isNaN(+e))throw new Error("threshold must be a number or array of numbers");e=[e]}return s&&!l&&(u=new ya(h),l=u.root,h=u.data),r.verbose&&(r.polygons?console.log("MarchingSquaresJS-isoLines: returning single lines (polygons) for each grid cell"):console.log("MarchingSquaresJS-isoLines: returning line paths (polygons) for entire data grid"),a&&console.log("MarchingSquaresJS-isoLines: multiple lines requested, returning array of line paths instead of lines for a single threshold")),e.forEach((function(t,e){if(f=[],r.threshold=t,r.verbose&&console.log("MarchingSquaresJS-isoLines: computing iso lines for threshold "+t),r.polygons)if(s)l.cellsBelowThreshold(r.threshold,!0).forEach((function(t){f=f.concat(ga(_a(h,t.x,t.y,r),t.x,t.y,r))}));else for(o=0;o<h.length-1;++o)for(e=0;e<h[0].length-1;++e)f=f.concat(ga(_a(h,e,o,r),e,o,r));else{for(c=[],e=0;e<h[0].length-1;++e)c[e]=[];if(s)l.cellsBelowThreshold(r.threshold,!1).forEach((function(t){c[t.x][t.y]=_a(h,t.x,t.y,r)}));else for(e=0;e<h[0].length-1;++e)for(o=0;o<h.length-1;++o)c[e][o]=_a(h,e,o,r);f=function(t,e,n){var r,i,o,s,a,u,l,h,c,f,g,p,v,d,y,_=[],x=t.length-1,E=t[0].length-1,k=["right","bottom","left","top"],b=[0,-1,0,1],w=[-1,0,1,0],I={bottom:1,left:2,top:3,right:0};return n.noFrame||function(t,e){var n,r,i,o,s;for(n=!0,r=t[0].length,i=t.length,s=0;s<i;s++)if(t[s][0]>=e||t[s][r-1]>=e){n=!1;break}if(n&&(t[i-1][0]>=e||t[i-1][r-1]>=e)&&(n=!1),n)for(o=0;o<r-1;o++)if(t[0][o]>=e||t[i-1][o]>e){n=!1;break}return n}(t,n.threshold)&&(n.linearRing?_.push([[0,0],[0,x],[E,x],[E,0],[0,0]]):_.push([[0,0],[0,x],[E,x],[E,0]])),e.forEach((function(t,N){t.forEach((function(t,S){for(r=null,i=0;i<4;i++)if(r=k[i],"object"===m(t.edges[r])){for(a=[],o=t.edges[r],u=r,l=N,h=S,c=!1,f=[N+o.path[0][0],S+o.path[0][1]],a.push(f);!c&&"object"===m((s=e[l][h]).edges[u]);)iLine truncated