From eb5f51795b23022ed7c3780e873fa25edb2ae175 Mon Sep 17 00:00:00 2001
From: livio <livio.merola@gmail.com>
Date: Fri, 25 Sep 2026 08:25:25 +0200
Subject: [PATCH] Migliora layer e persistenza nomi 0.4.1

---
 Components/Pages/Home.razor  |  27 ++-
 LMEMappeCatastaliApp.csproj  |   4 +-
 README.md                    |  14 ++
 Services/MapExportService.cs |   5 +-
 wwwroot/css/app.css          | 183 ++++++++++++++++--
 wwwroot/js/lme-map.js        | 365 ++++++++++++++++++++++++++---------
 6 files changed, 480 insertions(+), 118 deletions(-)

diff --git a/Components/Pages/Home.razor b/Components/Pages/Home.razor
index 0a9b7ab..9faaea7 100644
--- a/Components/Pages/Home.razor
+++ b/Components/Pages/Home.razor
@@ -340,27 +340,25 @@
                                     }
                                 </select>
                             </label>
-                            <div class="button-row">
+                            <div class="project-command-stack">
                                 <button @onclick="LoadProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Apri</button>
                                 <button class="danger-command" @onclick="DeleteProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Elimina</button>
+                            </div>
                             <label>
                                 Cartella
                                 <input @bind="ProjectFolder" placeholder="Es. Cantieri 2026" maxlength="60" />
                             </label>
-                            <div class="button-row">
+                            <div class="project-command-stack">
                                 <button class="secondary-command" @onclick="UpdateProjectFolder" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Sposta</button>
                                 <button class="secondary-command" @onclick="DuplicateProject" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Duplica</button>
-                            </div>
-                            <div class="button-row">
                                 <button class="secondary-command" @onclick="ToggleProjectArchive" disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">@(SelectedProject?.IsArchived == true ? "Ripristina" : "Archivia")</button>
                                 <button class="secondary-command" @onclick='() => ShareProject(false)' disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Condividi modificabile</button>
+                                <button class="secondary-command" @onclick='() => ShareProject(true)' disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Condividi in sola lettura</button>
                             </div>
-                            <button class="secondary-command" @onclick='() => ShareProject(true)' disabled="@(ProjectBusy || string.IsNullOrWhiteSpace(SelectedProjectId))">Condividi in sola lettura</button>
                             @if (SelectedProject?.IsReadOnly == true)
                             {
                                 <small class="field-help">Questo progetto è protetto. Usa Duplica per crearne una copia modificabile.</small>
                             }
-                            </div>
                             <label>
                                 Revisione precedente
                                 <select @bind="SelectedVersionId" disabled="@(ProjectVersions.Count == 0)">
@@ -418,15 +416,6 @@
                             <button class="secondary-command" @onclick="ShowCoordinateInspector">Coordinate WGS84 e UTM</button>
                             <button class="secondary-command" @onclick="ShowAuditLog">Registro operazioni</button>
                         </section>
-                        <section class="panel-section">
-                            <h2>Controllo geometrie</h2>
-                            <small class="field-help">Seleziona gli oggetti dalla mappa o dal pannello Layer.</small>
-                            <div class="button-row">
-                                <button class="secondary-command" @onclick="ValidateSelectedGeometries">Controlla e ripara</button>
-                                <button class="secondary-command" @onclick="CreateSelectedHole">Crea foro</button>
-                            </div>
-                            <button class="secondary-command" @onclick="CompareSelectedGeometries">Confronta due confini</button>
-                        </section>
                         <section class="panel-section">
                             <h2>Cestino</h2>
                             <div class="button-row">
@@ -516,6 +505,10 @@
                                 <input type="checkbox" @bind="SnapEnabled" @bind:after="ApplyAdvancedOptions" />
                                 <span>Aggancia i vertici agli oggetti vicini</span>
                             </label>
+                            <label class="toggle-line project-save-option">
+                                <input type="checkbox" @bind="AutoFitSelectedObject" @bind:after="ApplyAdvancedOptions" />
+                                <span>Centra e zooma quando seleziono un oggetto</span>
+                            </label>
                             <label>
                                 Distanza aggancio in pixel
                                 <input type="range" min="4" max="40" step="1" @bind="SnapDistancePixels" @bind:after="ApplyAdvancedOptions" />
@@ -675,6 +668,7 @@
     private bool AutoSaveOpenProject { get; set; }
     private string AutomaticBackupFrequency { get; set; } = "daily";
     private bool SnapEnabled { get; set; } = true;
+    private bool AutoFitSelectedObject { get; set; }
     private int SnapDistancePixels { get; set; } = 14;
     private bool GpsProximityEnabled { get; set; } = true;
     private bool GpsBoundaryAlertEnabled { get; set; }
@@ -1894,6 +1888,7 @@
         AutoSaveOpenProject = GetFlagPreference("auto_save_project", false);
         AutomaticBackupFrequency = Preferences.Default.Get($"{FlagPreferencePrefix}backup_frequency", "daily");
         SnapEnabled = GetFlagPreference("snap_enabled", true);
+        AutoFitSelectedObject = GetFlagPreference("auto_fit_selected_object", false);
         SnapDistancePixels = Preferences.Default.Get($"{FlagPreferencePrefix}snap_distance", 14);
         OfflineExtraZoomLevels = Preferences.Default.Get($"{FlagPreferencePrefix}offline_zoom_levels", 2);
         GpsProximityEnabled = GetFlagPreference("gps_proximity", true);
@@ -1928,6 +1923,7 @@
         SetFlagPreference("auto_save_project", AutoSaveOpenProject);
         Preferences.Default.Set($"{FlagPreferencePrefix}backup_frequency", AutomaticBackupFrequency);
         SetFlagPreference("snap_enabled", SnapEnabled);
+        SetFlagPreference("auto_fit_selected_object", AutoFitSelectedObject);
         Preferences.Default.Set($"{FlagPreferencePrefix}snap_distance", SnapDistancePixels);
         Preferences.Default.Set($"{FlagPreferencePrefix}offline_zoom_levels", OfflineExtraZoomLevels);
         SetFlagPreference("gps_proximity", GpsProximityEnabled);
@@ -1964,6 +1960,7 @@
         {
             autoSaveEnabled = AutoSaveEnabled,
             snapEnabled = SnapEnabled,
+            autoFitSelectedObject = AutoFitSelectedObject,
             snapDistancePixels = SnapDistancePixels,
             gpsProximityEnabled = GpsProximityEnabled,
             gpsBoundaryAlertEnabled = GpsBoundaryAlertEnabled
diff --git a/LMEMappeCatastaliApp.csproj b/LMEMappeCatastaliApp.csproj
index af0f740..a7a3dfe 100644
--- a/LMEMappeCatastaliApp.csproj
+++ b/LMEMappeCatastaliApp.csproj
@@ -28,8 +28,8 @@
         <ApplicationId>com.companyname.lmemappecatastaliapp</ApplicationId>
 
         <!-- Versions -->
-        <ApplicationDisplayVersion>0.4.0</ApplicationDisplayVersion>
-        <ApplicationVersion>35</ApplicationVersion>
+        <ApplicationDisplayVersion>0.4.1</ApplicationDisplayVersion>
+        <ApplicationVersion>36</ApplicationVersion>
         <Version>$(ApplicationDisplayVersion)</Version>
 
         <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
diff --git a/README.md b/README.md
index 52deada..621c3da 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,20 @@
 
 App .NET MAUI Blazor Hybrid per Android, iOS, Mac Catalyst e Windows, pensata per consultare mappe catastali e lavorare sul campo con GPS.
 
+## 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.
diff --git a/Services/MapExportService.cs b/Services/MapExportService.cs
index 9f0862e..8411c1e 100644
--- a/Services/MapExportService.cs
+++ b/Services/MapExportService.cs
@@ -85,7 +85,7 @@ public sealed class MapExportService
     {
         var root = new XElement("gpx",
             new XAttribute("version", "1.1"),
-            new XAttribute("creator", "LME Mappe Catastali 0.3.0"),
+            new XAttribute("creator", "LME Mappe Catastali 0.4.1"),
             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())
@@ -428,7 +428,8 @@ public sealed class MapExportService
     }
 
     private static string FeatureName(JsonElement properties, string category) =>
-        GetString(properties, "name")
+        GetString(properties, "_lmeDisplayName")
+        ?? GetString(properties, "name")
         ?? GetString(properties, "Name")
         ?? GetString(properties, "LABEL")
         ?? GetString(properties, "NATIONALCADASTRALREFERENCE")
diff --git a/wwwroot/css/app.css b/wwwroot/css/app.css
index e0c69ae..dc2e4e4 100644
--- a/wwwroot/css/app.css
+++ b/wwwroot/css/app.css
@@ -165,6 +165,7 @@ input[type="checkbox"] {
     position: absolute;
     top: 70px;
     right: 12px;
+    left: auto;
     z-index: 1150;
     display: grid;
     width: min(300px, calc(100vw - 24px));
@@ -240,6 +241,7 @@ input[type="checkbox"] {
     position: absolute;
     top: 72px;
     right: 12px;
+    left: auto;
     bottom: calc(var(--nav-height) + 8px);
     z-index: 1080;
     display: grid;
@@ -480,24 +482,32 @@ input[type="checkbox"] {
     background: var(--layer-group-surface, #fff);
 }
 
-.layer-manager-group > summary,
-.layer-manager-block > summary {
+.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: var(--layer-group-surface, #fff);
+    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 minmax(0, 1fr) 50px;
+    grid-template-columns: 28px 28px minmax(0, 1fr) 50px;
     grid-template-areas:
-        "handle title count"
-        ". visibility moves"
-        ". actions moves";
+        "handle expand title count"
+        ". . visibility moves"
+        ". . actions moves";
     align-items: start;
     gap: 6px;
     min-height: 38px;
@@ -506,6 +516,24 @@ input[type="checkbox"] {
     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 {
@@ -750,6 +778,7 @@ input[type="checkbox"] {
     justify-self: end;
     color: var(--muted);
     font-size: 10px;
+    font-weight: 900;
 }
 
 .layer-manager-children {
@@ -769,11 +798,19 @@ input[type="checkbox"] {
 }
 
 .layer-manager-object > summary {
-    grid-template-columns: 24px minmax(0, 1fr) 46px;
+    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;
@@ -840,6 +877,111 @@ input[type="checkbox"] {
     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;
@@ -916,14 +1058,15 @@ input[type="checkbox"] {
     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 {
@@ -1354,6 +1497,7 @@ footer {
     .map-layer-panel {
         top: 68px;
         right: 8px;
+        left: auto;
         bottom: calc(var(--nav-height) + 8px);
         width: 50vw;
     }
@@ -1361,6 +1505,7 @@ footer {
     .map-navigation-menu {
         top: 66px;
         right: 8px;
+        left: auto;
     }
 
     .tool-sheet {
@@ -1368,11 +1513,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;
diff --git a/wwwroot/js/lme-map.js b/wwwroot/js/lme-map.js
index 54b24b3..16b2633 100644
--- a/wwwroot/js/lme-map.js
+++ b/wwwroot/js/lme-map.js
@@ -28,6 +28,7 @@ const lmeState = {
     drawControl: null,
     drawingDeleteButton: null,
     drawingScopeMenu: null,
+    geometryToolsControl: null,
     ignoreMapClickUntil: 0,
     activeDrawHandler: null,
     drawEventsBound: false,
@@ -80,6 +81,7 @@ const lmeState = {
     snapEnabled: true,
     snapDistancePixels: 14,
     autoSaveEnabled: true,
+    autoFitSelectedObject: false,
     gpsProximityEnabled: true,
     gpsBoundaryAlertEnabled: false,
     lastBoundaryState: null,
@@ -251,6 +253,7 @@ function init(dotNetReference) {
     refreshCadastreLayer();
     bindFileImport();
     bindDrawingEvents();
+    addGeometryToolsControl();
 
     if (!lmeState.resizeBound) {
         window.addEventListener("resize", resize);
@@ -1186,7 +1189,7 @@ function layerManagerCategories() {
         { key: "gpsParcels", label: "Particella rilevata dal GPS", roots: [lmeState.gpsParcelLayer].filter(Boolean) },
         { key: "selectedParcels", label: "Particelle catastali evidenziate", roots: [lmeState.selectedParcelsLayer].filter(Boolean) },
         { key: "importedSheets", label: "Cornici e fogli importati", roots: [lmeState.importedSheets].filter(Boolean), blocks: true },
-        { key: "imported", label: "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) }
     ];
 }
@@ -1237,11 +1240,13 @@ function managedRecordsForCategory(category) {
 function managedObjectLabel(record, index) {
     const layer = record.layer;
     const properties = layer?.feature?.properties || {};
-    const reference = properties.NATIONALCADASTRALREFERENCE
+    const reference = properties._lmeDisplayName
+        || properties.name
+        || properties.Name
+        || properties.NATIONALCADASTRALREFERENCE
         || properties.INSPIREID_LOCALID
         || properties.LABEL
-        || properties.name
-        || properties.Name;
+        || properties.label;
     if (reference) {
         return String(reference);
     }
@@ -1265,7 +1270,7 @@ function managedObjectLabel(record, index) {
 
 function managedObjectEditableName(record) {
     const properties = record?.layer?.feature?.properties || {};
-    return properties.name || properties.Name || properties.label || properties.LABEL || "";
+    return properties._lmeDisplayName || properties.name || properties.Name || properties.label || properties.LABEL || "";
 }
 
 function managedObjectCanRename(record) {
@@ -1273,16 +1278,15 @@ function managedObjectCanRename(record) {
         && record.layer?.feature?.properties;
 }
 
-function renameManagedObject(record, index) {
+async function renameManagedObject(record, index) {
     if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return; }
     if (!managedObjectCanRename(record)) {
         return;
     }
     const currentName = String(managedObjectEditableName(record) || managedObjectLabel(record, index)).trim();
-    const requestedName = window.prompt("Nuovo nome oggetto", currentName);
-    if (requestedName === null) {
-        return;
-    }
+    const result = await showFormDialog("Rinomina oggetto", [{ name: "name", label: "Nome", value: currentName, maxLength: 120 }], "Rinomina");
+    if (!result) return;
+    const requestedName = result.name;
     const name = requestedName.trim().slice(0, 120);
     if (!name) {
         setInfo("Nome non modificato: inserisci un testo.");
@@ -1291,6 +1295,7 @@ function renameManagedObject(record, index) {
     rememberMapChange();
     const properties = record.layer.feature.properties;
     properties.name = name;
+    properties._lmeDisplayName = name;
     record.layer.lmeManagerLabel = record.categoryKey === "drawings" && record.layer instanceof L.Marker
         ? `POI: ${name}`
         : null;
@@ -1319,12 +1324,11 @@ function managedCategoryCanRename(category) {
     return ["drawings", "imported", "importedSheets"].includes(category.key);
 }
 
-function renameManagedCategory(category, records) {
+async function renameManagedCategory(category, records) {
     const currentName = managedCategoryName(category, records);
-    const requestedName = window.prompt("Nuovo nome gruppo", currentName);
-    if (requestedName === null) {
-        return;
-    }
+    const result = await showFormDialog("Rinomina gruppo", [{ name: "name", label: "Nome gruppo", value: currentName, maxLength: 120 }], "Rinomina");
+    if (!result) return;
+    const requestedName = result.name;
     const name = requestedName.trim().slice(0, 120);
     if (!name) {
         setInfo("Nome non modificato: inserisci un testo.");
@@ -1348,12 +1352,11 @@ function managedBlockName(source, records) {
         .find(Boolean) || source);
 }
 
-function renameManagedBlock(category, source, records) {
+async function renameManagedBlock(category, source, records) {
     const currentName = managedBlockName(source, records);
-    const requestedName = window.prompt("Nuovo nome gruppo", currentName);
-    if (requestedName === null) {
-        return;
-    }
+    const result = await showFormDialog("Rinomina gruppo", [{ name: "name", label: "Nome gruppo", value: currentName, maxLength: 120 }], "Rinomina");
+    if (!result) return;
+    const requestedName = result.name;
     const name = requestedName.trim().slice(0, 120);
     if (!name) {
         setInfo("Nome non modificato: inserisci un testo.");
@@ -1469,6 +1472,43 @@ function removeManagedRecords(records, subject) {
     setInfo(`${records.length === 1 ? "Oggetto rimosso" : `${records.length} oggetti rimossi`} dal progetto.`);
 }
 
+function moveManagedRecordsToCategory(records, targetCategory) {
+    if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return; }
+    const movable = records.filter(record => ["drawings", "imported"].includes(record.categoryKey));
+    if (!movable.length || !["drawings", "imported"].includes(targetCategory)) {
+        setInfo("Questo gruppo non puo essere spostato.");
+        return;
+    }
+    if (movable.some(record => record.layer?.feature?.properties?._lmeLocked)) {
+        setInfo("Sblocca il gruppo prima di spostarlo.");
+        return;
+    }
+    rememberMapChange();
+    const features = movable.map(record => {
+        const feature = record.layer.toGeoJSON();
+        feature.properties = {
+            ...(feature.properties || {}),
+            _lmeSource: feature.properties?._lmeSource || "Progetto corrente"
+        };
+        return feature;
+    });
+    movable.forEach(record => {
+        record.parent?.removeLayer?.(record.layer);
+        clearManagedObjectState(record.id);
+        lmeState.managerSelectedObjectIds.delete(record.id);
+    });
+    if (targetCategory === "drawings") {
+        features.forEach(feature => addDrawingFeature(feature));
+    } else {
+        addImportedFeatures({ type: "FeatureCollection", features });
+    }
+    refreshImportedMeasurements();
+    refreshDrawingMeasurements();
+    refreshLayerManager();
+    finishMapChange(`Spostati ${features.length} oggetti in ${targetCategory === "drawings" ? "Disegni e POI" : "Progetti e dati importati"}.`);
+    setInfo(`${features.length} oggetti spostati in ${targetCategory === "drawings" ? "Disegni e POI" : "Progetti e dati importati"}.`);
+}
+
 function managedObjectDetails(layer) {
     const details = [];
     const properties = layer?.feature?.properties || {};
@@ -1546,6 +1586,9 @@ function refreshLayerManager() {
     applyManagedVisualOrder(container);
     bindLayerManagerDrag(container);
     bindLayerManagerMoveButtons(container);
+    if (lmeState.managerHighlightedObjectId) {
+        window.requestAnimationFrame(() => revealManagedRecordInLayerManager(lmeState.managerHighlightedObjectId));
+    }
     if (scrollHost) {
         scrollHost.scrollTop = scrollTop;
         window.requestAnimationFrame(() => {
@@ -1557,6 +1600,8 @@ function refreshLayerManager() {
 function renderLayerManagerCategory(category, records) {
     const group = document.createElement("details");
     group.className = "layer-manager-group";
+    group.classList.toggle("layer-manager-selection-path", records.some(record =>
+        record.id === lmeState.managerHighlightedObjectId || lmeState.managerSelectedObjectIds.has(record.id)));
     group.dataset.dragType = "category";
     group.dataset.layerDepth = "0";
     group.dataset.categoryKey = category.key;
@@ -1576,7 +1621,8 @@ function renderLayerManagerCategory(category, records) {
         && (!category.roots.length || category.roots.some(layer => lmeState.map.hasLayer(layer)));
     const visible = categoryVisible;
     const categoryLocked = records.length > 0 && records.every(record => Boolean(record.layer?.feature?.properties?._lmeLocked));
-    group.innerHTML = `<summary><button type="button" class="layer-drag-handle" aria-label="Trascina gruppo">☰</button><input type="checkbox" ${visible ? "checked" : ""} aria-label="Mostra ${escapeHtml(categoryName)}"><span class="layer-manager-title">${escapeHtml(categoryName)}</span><button type="button" class="layer-inline-lock ${categoryLocked ? "is-locked" : ""}" aria-label="${categoryLocked ? "Sblocca" : "Blocca"} gruppo" title="${categoryLocked ? "Sblocca" : "Blocca"}">${categoryLocked ? "🔒" : "🔓"}</button>${rowActions}${layerManagerMoveButtons("gruppo")}<span class="layer-manager-count">${records.length}</span></summary><div class="layer-manager-children"></div>`;
+    group.innerHTML = `<summary>${layerExpandButton(group.open, categoryName)}<button type="button" class="layer-drag-handle" aria-label="Trascina gruppo">☰</button><input type="checkbox" ${visible ? "checked" : ""} aria-label="Mostra ${escapeHtml(categoryName)}"><span class="layer-manager-title">${escapeHtml(categoryName)}</span><button type="button" class="layer-inline-lock ${categoryLocked ? "is-locked" : ""}" aria-label="${categoryLocked ? "Sblocca" : "Blocca"} gruppo" title="${categoryLocked ? "Sblocca" : "Blocca"}">${categoryLocked ? "🔒" : "🔓"}</button>${rowActions}${layerManagerMoveButtons("gruppo")}<span class="layer-manager-count">${records.length}</span></summary><div class="layer-manager-children"></div>`;
+    bindLayerManagerToggleButton(group);
     const checkbox = group.querySelector("input");
     checkbox.indeterminate = categoryVisible && records.length > 0 && visibleCount < records.length;
     checkbox.addEventListener("click", event => event.stopPropagation());
@@ -1615,6 +1661,8 @@ function renderLayerManagerCategory(category, records) {
 function renderLayerManagerBlock(category, source, records) {
     const block = document.createElement("details");
     block.className = "layer-manager-block";
+    block.classList.toggle("layer-manager-selection-path", records.some(record =>
+        record.id === lmeState.managerHighlightedObjectId || lmeState.managerSelectedObjectIds.has(record.id)));
     block.dataset.dragType = "block";
     block.dataset.layerDepth = "1";
     block.dataset.categoryKey = category.key;
@@ -1629,7 +1677,8 @@ function renderLayerManagerBlock(category, source, records) {
         `<button type="button" class="layer-remove-button" aria-label="Rimuovi gruppo dal progetto" title="Rimuovi dal progetto">Rimuovi</button>`);
     block.classList.add("layer-manager-with-actions");
     const blockLocked = records.length > 0 && records.every(record => Boolean(record.layer?.feature?.properties?._lmeLocked));
-    block.innerHTML = `<summary><button type="button" class="layer-drag-handle" aria-label="Trascina blocco">☰</button><input type="checkbox" ${visible ? "checked" : ""} aria-label="Mostra ${escapeHtml(blockName)}"><span class="layer-manager-title">${escapeHtml(blockName)}</span><button type="button" class="layer-inline-lock ${blockLocked ? "is-locked" : ""}" aria-label="${blockLocked ? "Sblocca" : "Blocca"} gruppo" title="${blockLocked ? "Sblocca" : "Blocca"}">${blockLocked ? "🔒" : "🔓"}</button>${rowActions}${layerManagerMoveButtons("blocco")}<span class="layer-manager-count">${records.length}</span></summary><div class="layer-manager-children"></div>`;
+    block.innerHTML = `<summary>${layerExpandButton(block.open, blockName)}<button type="button" class="layer-drag-handle" aria-label="Trascina blocco">☰</button><input type="checkbox" ${visible ? "checked" : ""} aria-label="Mostra ${escapeHtml(blockName)}"><span class="layer-manager-title">${escapeHtml(blockName)}</span><button type="button" class="layer-inline-lock ${blockLocked ? "is-locked" : ""}" aria-label="${blockLocked ? "Sblocca" : "Blocca"} gruppo" title="${blockLocked ? "Sblocca" : "Blocca"}">${blockLocked ? "🔒" : "🔓"}</button>${rowActions}${layerManagerMoveButtons("blocco")}<span class="layer-manager-count">${records.length}</span></summary><div class="layer-manager-children"></div>`;
+    bindLayerManagerToggleButton(block);
     const checkbox = block.querySelector("input");
     checkbox.indeterminate = visibleCount > 0 && !visible;
     checkbox.addEventListener("click", event => event.stopPropagation());
@@ -1679,7 +1728,8 @@ function renderLayerManagerObject(record, index) {
     object.classList.toggle("layer-manager-with-actions", Boolean(rowActions));
     const objectName = managedObjectLabel(record, index);
     const locked = Boolean(record.layer?.feature?.properties?._lmeLocked);
-    object.innerHTML = `<summary><button type="button" class="layer-drag-handle" aria-label="Trascina oggetto">☰</button><input type="checkbox" ${visible ? "checked" : ""} aria-label="Mostra oggetto"><span class="layer-manager-title">${escapeHtml(objectName)}</span><button type="button" class="layer-inline-lock ${locked ? "is-locked" : ""}" aria-label="${locked ? "Sblocca" : "Blocca"} oggetto" title="${locked ? "Sblocca" : "Blocca"}">${locked ? "🔒" : "🔓"}</button>${rowActions}${layerManagerMoveButtons("oggetto")}<span class="layer-manager-count">›</span></summary><div class="layer-manager-details"></div>`;
+    object.innerHTML = `<summary>${layerExpandButton(object.open, objectName)}<button type="button" class="layer-drag-handle" aria-label="Trascina oggetto">☰</button><input type="checkbox" ${visible ? "checked" : ""} aria-label="Mostra oggetto"><span class="layer-manager-title">${escapeHtml(objectName)}</span><button type="button" class="layer-inline-lock ${locked ? "is-locked" : ""}" aria-label="${locked ? "Sblocca" : "Blocca"} oggetto" title="${locked ? "Sblocca" : "Blocca"}">${locked ? "🔒" : "🔓"}</button>${rowActions}${layerManagerMoveButtons("oggetto")}</summary><div class="layer-manager-details"></div>`;
+    bindLayerManagerToggleButton(object);
     const checkbox = object.querySelector("input");
     checkbox.addEventListener("click", event => event.stopPropagation());
     checkbox.addEventListener("change", () => setManagedObjectVisible(record, checkbox.checked, true));
@@ -1701,7 +1751,6 @@ function renderLayerManagerObject(record, index) {
     object.querySelector(".layer-manager-title").addEventListener("click", event => {
         event.preventDefault();
         event.stopPropagation();
-        object.open = true;
         highlightManagedObject(record);
     });
     const details = object.querySelector(".layer-manager-details");
@@ -1769,11 +1818,17 @@ function renderManagedGroupTools(records) {
     const tools = document.createElement("div");
     tools.className = "layer-group-tools";
     const properties = records[0]?.layer?.feature?.properties || {};
+    const sourceCategory = records[0]?.categoryKey;
+    const membershipAction = sourceCategory === "drawings"
+        ? `<button type="button" data-group-action="membership">Sposta in Progetti e dati importati</button>`
+        : sourceCategory === "imported"
+            ? `<button type="button" data-group-action="membership">Sposta in Disegni e POI</button>`
+            : "";
     tools.innerHTML = `<strong>Azioni gruppo</strong><span class="layer-group-totals">${escapeHtml(managedGroupTotals(records))}</span><div class="layer-style-controls">
         <label>Colore<input type="color" value="${normalizedColor(properties._lmeColor, "#16806a")}"></label>
         <label>Spessore<input type="range" min="1" max="10" step="1" value="${Number(properties._lmeWeight) || 3}"></label>
         <label>Opacita<input type="range" min="0.1" max="1" step="0.1" value="${Number(properties._lmeOpacity) || 1}"></label></div>
-        <div class="layer-compact-actions"><button type="button" data-group-action="select">Seleziona tutti</button><button type="button" data-group-action="lock">Blocca/sblocca</button><button type="button" data-group-action="labels">Etichette</button></div>`;
+        <div class="layer-compact-actions"><button type="button" data-group-action="select">Seleziona tutti</button><button type="button" data-group-action="lock">Blocca/sblocca</button><button type="button" data-group-action="labels">Etichette</button>${membershipAction}</div>`;
     const inputs = tools.querySelectorAll("input");
     inputs.forEach(input => input.addEventListener("change", () => {
         applyManagedStyle(records, { color: inputs[0].value, weight: Number(inputs[1].value), opacity: Number(inputs[2].value) });
@@ -1790,6 +1845,8 @@ function renderManagedGroupTools(records) {
         const visible = !records.every(record => Boolean(record.layer?.feature?.properties?._lmeLabelVisible));
         updateManagedProperties(records, properties => { properties._lmeLabelVisible = visible; });
     });
+    tools.querySelector("[data-group-action='membership']")?.addEventListener("click", () =>
+        moveManagedRecordsToCategory(records, sourceCategory === "drawings" ? "imported" : "drawings"));
     return tools;
 }
 
@@ -1812,6 +1869,11 @@ function renderManagedObjectTools(record) {
     const properties = record.layer.feature?.properties || (record.layer.feature = { type: "Feature", properties: {} }).properties;
     const selected = lmeState.managerSelectedObjectIds.has(record.id);
     const locked = Boolean(properties._lmeLocked);
+    const membershipAction = record.categoryKey === "drawings"
+        ? `<button type="button" data-action="membership">Sposta in Progetti e dati importati</button>`
+        : record.categoryKey === "imported"
+            ? `<button type="button" data-action="membership">Sposta in Disegni e POI</button>`
+            : "";
     const tools = document.createElement("section");
     tools.className = "layer-object-tools";
     tools.innerHTML = `<label class="layer-manager-suboption"><input type="checkbox" data-field="selected" ${selected ? "checked" : ""}><span>Seleziona per azioni multiple</span></label>
@@ -1826,7 +1888,7 @@ function renderManagedObjectTools(record) {
         <label>Note<textarea data-field="notes" rows="2" maxlength="1000" placeholder="Note tecniche">${escapeHtml(properties._lmeNotes || "")}</textarea></label>
         <label class="layer-photo-picker">Foto<input type="file" data-field="photo" accept="image/*"></label>
         ${properties._lmePhoto ? `<img class="layer-photo-preview" src="${properties._lmePhoto}" alt="Foto allegata"><button type="button" data-action="remove-photo">Rimuovi foto</button>` : ""}
-        <div class="layer-compact-actions"><button type="button" data-action="attributes">Attributi</button><button type="button" data-action="duplicate">Duplica</button><button type="button" data-action="numeric">Coordinate</button><button type="button" data-action="inspect">WGS84 / UTM</button><button type="button" data-action="move">Sposta</button><button type="button" data-action="buffer">Buffer</button></div>`;
+        <div class="layer-compact-actions"><button type="button" data-action="attributes">Attributi</button><button type="button" data-action="duplicate">Duplica</button><button type="button" data-action="numeric">Coordinate</button><button type="button" data-action="inspect">WGS84 / UTM</button><button type="button" data-action="move">Sposta geometria</button><button type="button" data-action="buffer">Buffer</button>${membershipAction}</div>`;
     tools.querySelector("[data-field='selected']").addEventListener("change", event => {
         if (event.target.checked) lmeState.managerSelectedObjectIds.add(record.id);
         else lmeState.managerSelectedObjectIds.delete(record.id);
@@ -1856,6 +1918,8 @@ function renderManagedObjectTools(record) {
     tools.querySelector("[data-action='inspect']").addEventListener("click", () => showCoordinateInspectorForRecord(record));
     tools.querySelector("[data-action='move']").addEventListener("click", () => moveManagedRecords([record]));
     tools.querySelector("[data-action='buffer']").addEventListener("click", () => bufferManagedRecords([record]));
+    tools.querySelector("[data-action='membership']")?.addEventListener("click", () =>
+        moveManagedRecordsToCategory([record], record.categoryKey === "drawings" ? "imported" : "drawings"));
     return tools;
 }
 
@@ -1867,25 +1931,35 @@ function editManagedAttributes(record) {
     if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return; }
     const properties = record.layer?.feature?.properties || {};
     const reserved = new Set(["name", "Name", "label", "LABEL"]);
-    const current = Object.entries(properties)
-        .filter(([key, value]) => !key.startsWith("_lme") && !reserved.has(key) && ["string", "number", "boolean"].includes(typeof value))
-        .map(([key, value]) => `${key}=${value}`).join("\n");
-    const value = window.prompt("Attributi, uno per riga nel formato chiave=valore\nEsempi: foglio, particella, proprietario, qualita, data_rilievo, stato", current);
-    if (value === null) return;
-    const parsed = {};
-    value.split(/\r?\n/).forEach(line => {
-        const separator = line.indexOf("=");
-        if (separator < 1) return;
-        const key = line.slice(0, separator).trim().replace(/[^a-zA-Z0-9_ -]/g, "_").slice(0, 60);
-        const raw = line.slice(separator + 1).trim().slice(0, 500);
-        if (key) parsed[key] = raw;
+    const entries = Object.entries(properties)
+        .filter(([key, value]) => !key.startsWith("_lme") && !reserved.has(key) && ["string", "number", "boolean"].includes(typeof value));
+    const dialog = showAppDialog("Attributi oggetto", `<div class="attribute-editor"><p>Ogni attributo viene salvato nel progetto e negli export GeoJSON, KML e KMZ.</p><div class="attribute-editor-rows"></div><button type="button" data-add-attribute>+ Aggiungi attributo</button><div class="dialog-command-row"><button type="button" data-cancel>Annulla</button><button type="button" class="primary-command" data-save-attributes>Salva attributi</button></div></div>`);
+    const rows = dialog.querySelector(".attribute-editor-rows");
+    const addRow = (key = "", value = "") => {
+        const row = document.createElement("div");
+        row.className = "attribute-editor-row";
+        row.innerHTML = `<label>Nome<input type="text" maxlength="60" value="${escapeHtml(key)}" placeholder="Es. proprietario"></label><label>Valore<textarea rows="3" maxlength="4000" placeholder="Testo anche su piu righe">${escapeHtml(String(value))}</textarea></label><button type="button" title="Rimuovi attributo" aria-label="Rimuovi attributo">×</button>`;
+        row.querySelector("button").addEventListener("click", () => row.remove());
+        rows.appendChild(row);
+    };
+    entries.forEach(([key, value]) => addRow(key, value));
+    if (!entries.length) addRow();
+    dialog.querySelector("[data-add-attribute]").addEventListener("click", () => addRow());
+    dialog.querySelector("[data-cancel]").addEventListener("click", () => dialog.remove());
+    dialog.querySelector("[data-save-attributes]").addEventListener("click", () => {
+        const parsed = {};
+        rows.querySelectorAll(".attribute-editor-row").forEach(row => {
+            const key = row.querySelector("input").value.trim().replace(/[^a-zA-Z0-9_ -]/g, "_").slice(0, 60);
+            const value = row.querySelector("textarea").value.slice(0, 4000);
+            if (key) parsed[key] = value;
+        });
+        updateManagedProperties([record], target => {
+            Object.keys(target).filter(key => !key.startsWith("_lme") && !reserved.has(key)).forEach(key => delete target[key]);
+            Object.assign(target, parsed);
+        });
+        setInfo(`${Object.keys(parsed).length} attributi aggiornati.`);
+        dialog.remove();
     });
-    updateManagedProperties([record], target => {
-        Object.keys(target).filter(key => !key.startsWith("_lme") && !reserved.has(key)).forEach(key => delete target[key]);
-        Object.assign(target, parsed);
-    });
-    finishMapChange("Aggiornamento attributi");
-    setInfo(`${Object.keys(parsed).length} attributi aggiornati.`);
 }
 
 function utmFromLatLng(latitude, longitude) {
@@ -1949,19 +2023,66 @@ function showAppDialog(title, bodyHtml) {
     return overlay;
 }
 
+function showFormDialog(title, fields, submitLabel = "Salva") {
+    return new Promise(resolve => {
+        const fieldHtml = fields.map(field => {
+            const common = `name="${escapeHtml(field.name)}" ${field.required === false ? "" : "required"} ${field.maxLength ? `maxlength="${field.maxLength}"` : ""}`;
+            const control = field.type === "textarea"
+                ? `<textarea ${common} rows="${field.rows || 5}">${escapeHtml(field.value ?? "")}</textarea>`
+                : `<input ${common} type="${field.type || "text"}" value="${escapeHtml(field.value ?? "")}" ${field.step ? `step="${field.step}"` : ""}>`;
+            return `<label>${escapeHtml(field.label)}${control}${field.help ? `<small>${escapeHtml(field.help)}</small>` : ""}</label>`;
+        }).join("");
+        const dialog = showAppDialog(title, `<form class="lme-edit-form">${fieldHtml}<div class="dialog-command-row"><button type="button" data-cancel>Annulla</button><button type="submit" class="primary-command">${escapeHtml(submitLabel)}</button></div></form>`);
+        const form = dialog.querySelector("form");
+        let settled = false;
+        const finish = value => { if (settled) return; settled = true; resolve(value); dialog.remove(); };
+        dialog.querySelector("header button").addEventListener("click", () => finish(null), { capture: true });
+        dialog.querySelector("[data-cancel]").addEventListener("click", () => finish(null));
+        dialog.addEventListener("click", event => { if (event.target === dialog) finish(null); }, { capture: true });
+        form.addEventListener("submit", event => {
+            event.preventDefault();
+            const values = {};
+            fields.forEach(field => { values[field.name] = form.elements[field.name]?.value ?? ""; });
+            finish(values);
+        });
+        form.elements[fields[0]?.name]?.focus();
+    });
+}
+
 function showObjectTable() {
     const records = layerManagerCategories().flatMap(category => managedRecordsForCategory(category));
+    lmeState.managerRecords = new Map(records.map(record => [record.id, record]));
     const body = records.map((record, index) => {
         const properties = record.layer?.feature?.properties || {};
         const details = managedObjectDetails(record.layer);
-        return `<tr data-object-id="${escapeHtml(record.id)}"><td><button type="button" data-locate="${escapeHtml(record.id)}">⌖</button></td><td>${escapeHtml(managedObjectLabel(record, index))}</td><td>${escapeHtml(record.categoryKey)}</td><td>${escapeHtml(properties.foglio || properties.FOGLIO || "")}</td><td>${escapeHtml(properties.particella || properties.PARTICELLA || properties.LABEL || "")}</td><td>${escapeHtml(details.slice(0, 2).join(" | "))}</td></tr>`;
+        const selected = lmeState.managerSelectedObjectIds.has(record.id);
+        const locked = Boolean(properties._lmeLocked);
+        return `<tr data-object-id="${escapeHtml(record.id)}"><td><input type="checkbox" data-select="${escapeHtml(record.id)}" ${selected ? "checked" : ""} aria-label="Seleziona ${escapeHtml(managedObjectLabel(record, index))}"></td><td><input type="checkbox" data-lock="${escapeHtml(record.id)}" ${locked ? "checked" : ""} ${lmeState.readOnly ? "disabled" : ""} aria-label="Blocca ${escapeHtml(managedObjectLabel(record, index))}"></td><td><button type="button" data-locate="${escapeHtml(record.id)}" title="Mostra sulla mappa" aria-label="Mostra sulla mappa">⌖</button></td><td>${escapeHtml(managedObjectLabel(record, index))}</td><td>${escapeHtml(managedCategoryName(layerManagerCategories().find(item => item.key === record.categoryKey) || { key: record.categoryKey, label: record.categoryKey }, [record]))}</td><td>${escapeHtml(properties.foglio || properties.FOGLIO || "")}</td><td>${escapeHtml(properties.particella || properties.PARTICELLA || properties.LABEL || "")}</td><td>${escapeHtml(details.slice(0, 2).join(" | "))}</td></tr>`;
     }).join("");
-    const dialog = showAppDialog("Elenco oggetti e particelle", `<label class="object-table-search">Filtra<input type="search" placeholder="Nome, foglio, particella o gruppo"></label><div class="object-table-wrap"><table><thead><tr><th></th><th>Nome</th><th>Gruppo</th><th>Foglio</th><th>Particella</th><th>Misure</th></tr></thead><tbody>${body || "<tr><td colspan='6'>Nessun oggetto</td></tr>"}</tbody></table></div>`);
+    const dialog = showAppDialog("Elenco oggetti e particelle", `<label class="object-table-search">Filtra<input type="search" placeholder="Nome, foglio, particella o gruppo"></label><div class="object-table-legend"><span>Seleziona più oggetti con i flag nella colonna Selez.</span><span>Il lucchetto impedisce modifiche e rimozioni.</span></div><div class="object-table-wrap"><table><thead><tr><th>Selez.</th><th>Blocca</th><th>Mappa</th><th>Nome</th><th>Gruppo</th><th>Foglio</th><th>Particella</th><th>Misure</th></tr></thead><tbody>${body || "<tr><td colspan='8'>Nessun oggetto</td></tr>"}</tbody></table></div>`);
     const byId = new Map(records.map(record => [record.id, record]));
-    dialog.querySelector("input").addEventListener("input", event => {
+    dialog.querySelector("input[type='search']").addEventListener("input", event => {
         const query = event.target.value.toLocaleLowerCase("it");
         dialog.querySelectorAll("tbody tr").forEach(row => { row.hidden = query && !row.textContent.toLocaleLowerCase("it").includes(query); });
     });
+    dialog.querySelectorAll("[data-select]").forEach(input => input.addEventListener("change", () => {
+        if (input.checked) lmeState.managerSelectedObjectIds.add(input.dataset.select);
+        else lmeState.managerSelectedObjectIds.delete(input.dataset.select);
+        const record = byId.get(input.dataset.select);
+        if (record && input.checked) {
+            lmeState.managerHighlightedObjectId = record.id;
+            lmeState.managerHighlightedCategoryKey = record.categoryKey;
+            renderManagerHighlight([record]);
+        }
+        refreshLayerManager();
+        setInfo(`${lmeState.managerSelectedObjectIds.size} oggetti selezionati.`);
+    }));
+    dialog.querySelectorAll("[data-lock]").forEach(input => input.addEventListener("change", () => {
+        const record = byId.get(input.dataset.lock);
+        if (!record) return;
+        updateManagedProperties([record], properties => { properties._lmeLocked = input.checked; });
+        setInfo(input.checked ? "Oggetto bloccato." : "Oggetto sbloccato.");
+    }));
     dialog.querySelectorAll("[data-locate]").forEach(button => button.addEventListener("click", () => {
         const record = byId.get(button.dataset.locate); if (!record) return;
         dialog.remove(); highlightManagedObject(record);
@@ -2088,12 +2209,17 @@ function duplicateManagedRecords(records) {
     setInfo(`${records.length} ${records.length === 1 ? "oggetto duplicato" : "oggetti duplicati"}.`);
 }
 
-function moveManagedRecords(records) {
+async function moveManagedRecords(records) {
     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 spostare."); return; }
-    const north = Number(window.prompt("Spostamento verso nord in metri (negativo verso sud)", "0"));
+    const result = await showFormDialog("Sposta oggetti", [
+        { name: "north", label: "Metri verso nord (negativo verso sud)", type: "number", value: "0", step: "0.01" },
+        { name: "east", label: "Metri verso est (negativo verso ovest)", type: "number", value: "0", step: "0.01" }
+    ], "Sposta");
+    if (!result) return;
+    const north = Number(result.north);
     if (!Number.isFinite(north)) return;
-    const east = Number(window.prompt("Spostamento verso est in metri (negativo verso ovest)", "0"));
+    const east = Number(result.east);
     if (!Number.isFinite(east) || (!north && !east)) return;
     const distance = Math.hypot(north, east);
     const bearing = Math.atan2(east, north) * 180 / Math.PI;
@@ -2105,9 +2231,11 @@ function moveManagedRecords(records) {
     finishManagedGeometryChange(`Spostati ${records.length} oggetti.`);
 }
 
-function bufferManagedRecords(records) {
+async function bufferManagedRecords(records) {
     if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return; }
-    const meters = Number(window.prompt("Distanza buffer in metri", "5"));
+    const result = await showFormDialog("Crea buffer", [{ name: "meters", label: "Distanza in metri", type: "number", value: "5", step: "0.01" }], "Crea buffer");
+    if (!result) return;
+    const meters = Number(result.meters);
     if (!Number.isFinite(meters) || meters <= 0) return;
     rememberMapChange();
     let count = 0;
@@ -2158,14 +2286,17 @@ function splitManagedRecords(records) {
 }
 
 function selectedManagedRecords() {
-    const current = lmeState.managerRecords || new Map();
+    const current = new Map(layerManagerCategories()
+        .flatMap(category => managedRecordsForCategory(category))
+        .map(record => [record.id, record]));
+    lmeState.managerRecords = current;
     return [...lmeState.managerSelectedObjectIds].map(id => current.get(id)).filter(Boolean);
 }
 
 function createHoleFromSelected() {
     if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return false; }
     const polygons = selectedManagedRecords().filter(record => record.layer instanceof L.Polygon);
-    if (polygons.length !== 2) { setInfo("Seleziona esattamente due poligoni: prima l'area esterna e poi l'area da escludere."); return false; }
+    if (polygons.length !== 2) { showGeometryResult("Creazione foro", "Seleziona esattamente due poligoni: l'area esterna e l'area interna da escludere.", "warning"); return false; }
     try {
         const ordered = [...polygons].sort((left, right) => turf.area(right.layer.toGeoJSON()) - turf.area(left.layer.toGeoJSON()));
         const outer = ordered[0].layer.toGeoJSON();
@@ -2179,14 +2310,15 @@ function createHoleFromSelected() {
         ordered.forEach(removeRecordWithoutPrompt);
         lmeState.managerSelectedObjectIds.clear();
         finishManagedGeometryChange("Poligono con foro creato correttamente.");
+        showGeometryResult("Foro creato", "Il nuovo poligono contiene l'area interna esclusa. I due oggetti originali sono stati sostituiti.", "success");
         return true;
-    } catch (error) { setInfo(`Creazione foro non riuscita: ${error.message}`); return false; }
+    } catch (error) { showGeometryResult("Creazione foro non riuscita", error.message, "error"); return false; }
 }
 
 function validateAndRepairSelected() {
     if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return "Progetto in sola lettura"; }
     const records = selectedManagedRecords();
-    if (!records.length) { setInfo("Seleziona gli oggetti da controllare."); return "Nessuna selezione"; }
+    if (!records.length) { showGeometryResult("Controlla e ripara", "Seleziona uno o più oggetti dalla mappa, dal pannello Layer o dalla tabella oggetti.", "warning"); return "Nessuna selezione"; }
     let valid = 0; let repaired = 0; let rejected = 0;
     rememberMapChange();
     records.forEach((record, index) => {
@@ -2209,14 +2341,16 @@ function validateAndRepairSelected() {
         } catch { rejected++; }
     });
     lmeState.managerSelectedObjectIds.clear();
-    finishManagedGeometryChange(`Controllo geometrie: ${valid} valide, ${repaired} riparate, ${rejected} non riparabili.`);
+    const message = `Controllati ${records.length} oggetti: ${valid} validi, ${repaired} riparati, ${rejected} non riparabili.`;
+    finishManagedGeometryChange(message);
+    showGeometryResult("Controllo geometrie completato", message, rejected ? "warning" : "success");
     return `${valid} valide, ${repaired} riparate, ${rejected} non riparabili`;
 }
 
 function compareSelectedGeometries() {
     if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return false; }
     const polygons = selectedManagedRecords().filter(record => record.layer instanceof L.Polygon);
-    if (polygons.length !== 2) { setInfo("Seleziona esattamente due poligoni da confrontare."); return false; }
+    if (polygons.length !== 2) { showGeometryResult("Confronta due confini", "Seleziona esattamente due poligoni dalla mappa, dal pannello Layer o dalla tabella oggetti.", "warning"); return false; }
     try {
         const first = polygons[0].layer.toGeoJSON(); const second = polygons[1].layer.toGeoJSON();
         const onlyFirst = turf.difference(turf.featureCollection([first, second]));
@@ -2231,34 +2365,72 @@ function compareSelectedGeometries() {
         addResult(onlyFirst, `Solo ${managedObjectLabel(polygons[0], 0)}`, "#ef4444");
         addResult(onlySecond, `Solo ${managedObjectLabel(polygons[1], 1)}`, "#3b82f6");
         addResult(overlap, "Sovrapposizione", "#16a34a");
-        const firstArea = onlyFirst ? turf.area(onlyFirst) : 0; const secondArea = onlySecond ? turf.area(onlySecond) : 0;
-        finishManagedGeometryChange(`Confronto creato: eccedenza ${formatArea(firstArea)}, mancanza ${formatArea(secondArea)}.`);
+        const firstArea = onlyFirst ? turf.area(onlyFirst) : 0; const secondArea = onlySecond ? turf.area(onlySecond) : 0; const overlapArea = overlap ? turf.area(overlap) : 0;
+        const message = `Confronto creato. Solo primo confine: ${formatArea(firstArea)}. Solo secondo confine: ${formatArea(secondArea)}. Sovrapposizione: ${formatArea(overlapArea)}.`;
+        finishManagedGeometryChange(message);
+        showGeometryResult("Confronto completato", `${message} Sulla mappa: rosso solo primo, blu solo secondo, verde sovrapposizione.`, "success");
         return true;
-    } catch (error) { setInfo(`Confronto non riuscito: ${error.message}`); return false; }
+    } catch (error) { showGeometryResult("Confronto non riuscito", error.message, "error"); return false; }
 }
 
-function numericEditManagedRecord(record) {
+function showGeometryResult(title, message, tone = "success") {
+    setInfo(`${title}: ${message}`);
+    const icons = { success: "✓", warning: "!", error: "×" };
+    showAppDialog(title, `<div class="geometry-result geometry-result-${tone}"><span aria-hidden="true">${icons[tone] || "i"}</span><p>${escapeHtml(message)}</p></div>`);
+}
+
+function addGeometryToolsControl() {
+    if (lmeState.geometryToolsControl || !lmeState.map) return;
+    const GeometryTools = L.Control.extend({
+        options: { position: "topright" },
+        onAdd() {
+            const container = L.DomUtil.create("div", "leaflet-bar lme-geometry-toolbar");
+            const actions = [
+                { icon: "✓", title: "Controlla e ripara geometrie", run: validateAndRepairSelected },
+                { icon: "◉", title: "Crea foro da due poligoni", run: createHoleFromSelected },
+                { icon: "⇄", title: "Confronta due confini", run: compareSelectedGeometries }
+            ];
+            actions.forEach(action => {
+                const button = L.DomUtil.create("a", "", container);
+                button.href = "#";
+                button.title = action.title;
+                button.setAttribute("role", "button");
+                button.setAttribute("aria-label", action.title);
+                button.textContent = action.icon;
+                L.DomEvent.on(button, "click", event => { L.DomEvent.stop(event); action.run(); });
+            });
+            L.DomEvent.disableClickPropagation(container);
+            return container;
+        }
+    });
+    lmeState.geometryToolsControl = new GeometryTools().addTo(lmeState.map);
+}
+
+async function numericEditManagedRecord(record) {
     if (lmeState.readOnly) { setInfo("Il progetto e' in sola lettura."); return; }
     if (record.layer?.feature?.properties?._lmeLocked) { setInfo("Sblocca prima l'oggetto."); return; }
     if (record.layer instanceof L.Circle) {
         const center = record.layer.getLatLng();
-        const value = window.prompt("Latitudine, longitudine, raggio in metri", `${center.lat.toFixed(7)}, ${center.lng.toFixed(7)}, ${record.layer.getRadius().toFixed(2)}`);
-        if (value === null) return;
+        const result = await showFormDialog("Modifica cerchio", [{ name: "coordinates", label: "Latitudine, longitudine, raggio in metri", type: "textarea", rows: 3, value: `${center.lat.toFixed(7)}, ${center.lng.toFixed(7)}, ${record.layer.getRadius().toFixed(2)}` }], "Applica");
+        if (!result) return;
+        const value = result.coordinates;
         const parts = value.split(/[;, ]+/).map(Number).filter(Number.isFinite);
         if (parts.length < 3) { setInfo("Inserisci latitudine, longitudine e raggio validi."); return; }
         rememberMapChange(); record.layer.setLatLng([parts[0], parts[1]]); record.layer.setRadius(parts[2]); annotateDrawingLayer(record.layer, "circle");
     } else if (typeof record.layer?.getLatLng === "function") {
         const point = record.layer.getLatLng();
-        const value = window.prompt("Latitudine, longitudine", `${point.lat.toFixed(7)}, ${point.lng.toFixed(7)}`);
-        if (value === null) return;
+        const result = await showFormDialog("Modifica punto", [{ name: "coordinates", label: "Latitudine, longitudine", type: "textarea", rows: 3, value: `${point.lat.toFixed(7)}, ${point.lng.toFixed(7)}` }], "Applica");
+        if (!result) return;
+        const value = result.coordinates;
         const parts = value.split(/[;, ]+/).map(Number).filter(Number.isFinite);
         if (parts.length < 2) { setInfo("Inserisci coordinate valide."); return; }
         rememberMapChange(); record.layer.setLatLng([parts[0], parts[1]]);
     } else {
         const lines = lineLatLngGroups(record.layer.getLatLngs());
         const current = lines[0]?.map(point => `${point.lat.toFixed(7)},${point.lng.toFixed(7)}`).join("; ") || "";
-        const value = window.prompt("Vertici: coppie latitudine,longitudine separate da punto e virgola", current);
-        if (value === null) return;
+        const result = await showFormDialog("Modifica vertici", [{ name: "coordinates", label: "Coppie latitudine,longitudine separate da punto e virgola", type: "textarea", rows: 8, value: current }], "Applica");
+        if (!result) return;
+        const value = result.coordinates;
         const points = value.split(";").map(pair => pair.split(",").map(Number)).filter(pair => pair.length === 2 && pair.every(Number.isFinite));
         if (points.length < 2) { setInfo("Servono almeno due vertici validi."); return; }
         rememberMapChange(); record.layer.setLatLngs(points.map(point => L.latLng(point[0], point[1])));
@@ -2379,6 +2551,7 @@ function setAdvancedOptions(options) {
     lmeState.snapEnabled = value.snapEnabled !== false;
     lmeState.snapDistancePixels = Math.max(4, Math.min(40, Number(value.snapDistancePixels) || 14));
     lmeState.autoSaveEnabled = value.autoSaveEnabled !== false;
+    lmeState.autoFitSelectedObject = Boolean(value.autoFitSelectedObject);
     lmeState.gpsProximityEnabled = value.gpsProximityEnabled !== false;
     lmeState.gpsBoundaryAlertEnabled = Boolean(value.gpsBoundaryAlertEnabled);
 }
@@ -2504,6 +2677,26 @@ function bindLayerManagerExpansion(row, key) {
         } else {
             lmeState.managerExpandedRows.delete(key);
         }
+        const button = row.querySelector(":scope > summary > .layer-expand-button");
+        if (button) {
+            button.textContent = row.open ? "▾" : "▸";
+            button.setAttribute("aria-expanded", String(row.open));
+        }
+    });
+}
+
+function layerExpandButton(expanded, label) {
+    return `<button type="button" class="layer-expand-button" aria-label="${expanded ? "Comprimi" : "Espandi"} ${escapeHtml(label)}" aria-expanded="${expanded}">${expanded ? "▾" : "▸"}</button>`;
+}
+
+function bindLayerManagerToggleButton(row) {
+    const summary = row.querySelector(":scope > summary");
+    const button = summary?.querySelector(".layer-expand-button");
+    summary?.addEventListener("click", event => event.preventDefault());
+    button?.addEventListener("click", event => {
+        event.preventDefault();
+        event.stopPropagation();
+        row.open = !row.open;
     });
 }
 
@@ -2603,7 +2796,21 @@ function highlightManagedObject(record) {
     });
     setSelectedDrawing(record.categoryKey === "drawings" ? record.layer : null);
     renderManagerHighlight([record]);
-    fitLayer(record.layer);
+    if (lmeState.autoFitSelectedObject) {
+        fitLayer(record.layer);
+    }
+    revealManagedRecordInLayerManager(record.id);
+}
+
+function revealManagedRecordInLayerManager(recordId) {
+    const row = document.querySelector(`.layer-manager-object[data-object-id="${CSS.escape(recordId)}"]`);
+    if (!row) return;
+    const block = row.closest(".layer-manager-block");
+    const group = row.closest(".layer-manager-group");
+    if (group) group.classList.add("layer-manager-selection-path");
+    if (block) block.classList.add("layer-manager-selection-path");
+    row.classList.add("layer-manager-object-selected");
+    row.scrollIntoView({ block: "nearest", behavior: "smooth" });
 }
 
 function drawingEditToolbar() {
@@ -2668,7 +2875,6 @@ function bindManagedParentHighlight(row, key, records) {
     row.querySelector(":scope > summary > .layer-manager-title").addEventListener("click", event => {
         event.preventDefault();
         event.stopPropagation();
-        row.open = true;
         highlightManagedParent(row, key, records);
     });
     summary.addEventListener("pointerenter", () => {
@@ -3404,6 +3610,7 @@ function bindDrawingLayerSelection(layer) {
         }
         selectDrawingLayer(layer);
         refreshLayerManager();
+        window.requestAnimationFrame(() => revealManagedRecordInLayerManager(id));
     });
 }
 
@@ -3424,6 +3631,7 @@ function bindManagedMapSelection(layer, categoryKey, parent) {
         else lmeState.managerSelectedObjectIds.add(record.id);
         highlightManagedObject(record);
         refreshLayerManager();
+        window.requestAnimationFrame(() => revealManagedRecordInLayerManager(record.id));
         setInfo(`Selezionato dalla mappa: ${managedObjectEditableName(record) || "oggetto"}.`);
     });
 }
@@ -4123,23 +4331,6 @@ function emptyFeatureCollection() {
 function managedGroupGeoJson(group, categoryKey) {
     const collection = group?.toGeoJSON?.() || emptyFeatureCollection();
     const features = [...(collection.features || [])];
-    const existingIds = new Set(features.map(feature => feature?.properties?._lmeManagerId).filter(Boolean));
-    lmeState.managerHiddenObjects.forEach(record => {
-        if (record.categoryKey !== categoryKey) {
-            return;
-        }
-        const hidden = record.layer?.toGeoJSON?.();
-        const hiddenFeatures = hidden?.type === "FeatureCollection" ? hidden.features : hidden ? [hidden] : [];
-        hiddenFeatures.forEach(feature => {
-            const id = feature?.properties?._lmeManagerId;
-            if (!id || !existingIds.has(id)) {
-                features.push(feature);
-                if (id) {
-                    existingIds.add(id);
-                }
-            }
-        });
-    });
     const categoryName = lmeState.managerCategoryNames[categoryKey];
     if (categoryName) {
         features.forEach(feature => {