Add multi-select and automatically multi-select when finishing a gridify action

Author: CorruptComputer

Alidade.Map/MapInteropService.cs

@@ -114,10 +114,10 @@ public ValueTask ClearBackgroundImageryAsync()
     /// <param name="screenX">Click X position in CSS pixels.</param>
     /// <param name="screenY">Click Y position in CSS pixels.</param>
     /// <param name="elementId">The feature ID string under the click, if any.</param>
-    /// <param name="shiftKey">Whether the Shift key was held during the click.</param>
+    /// <param name="addToSelection">Whether a modifier key (Shift, Ctrl, or Cmd) was held during the click.</param>
     [JSInvokable]
-    public void OnMapClick(double lat, double lon, double screenX, double screenY, string? elementId, bool shiftKey = false)
-        => _ = mediator.Publish(new MapClicked.Notification(new MapClickEvent(lat, lon, screenX, screenY, elementId, shiftKey)));
+    public void OnMapClick(double lat, double lon, double screenX, double screenY, string? elementId, bool addToSelection = false)
+        => _ = mediator.Publish(new MapClicked.Notification(new MapClickEvent(lat, lon, screenX, screenY, elementId, addToSelection)));
 
     /// <summary>
     ///   Called from JS when the user double-clicks the map canvas on an OSM feature.

Alidade.Map/Models/MapClickEvent.cs

@@ -11,5 +11,5 @@ namespace Alidade.Map.Models;
 ///   The feature ID of the topmost OSM element under the click (e.g. <c>"node/12345"</c>),
 ///   or null if the click landed on empty map space.
 /// </param>
-/// <param name="ShiftKey">Whether the Shift key was held at the time of the click (used for multi-select).</param>
-public record MapClickEvent(double Lat, double Lon, double ScreenX, double ScreenY, string? ElementId, bool ShiftKey = false);
+/// <param name="AddToSelection">Whether a modifier key (Shift, Ctrl, or Cmd) was held at the time of the click, adding the element to the current selection.</param>
+public record MapClickEvent(double Lat, double Lon, double ScreenX, double ScreenY, string? ElementId, bool AddToSelection = false);

Alidade.Map/wwwroot/assets/js/map-interop.js

@@ -1222,7 +1222,8 @@ window.mapInterop = (() => {
                 style: blankStyle,
                 center: saved ? [saved.lon, saved.lat] : [0, 20],
                 zoom:   saved ? saved.zoom              : 2,
-                attributionControl: false
+                attributionControl: false,
+                boxZoom: false
             });
 
             map.addControl(new maplibregl.AttributionControl({ compact: true }), 'bottom-right');
@@ -1285,7 +1286,7 @@ window.mapInterop = (() => {
                     e.lngLat.lat, e.lngLat.lng,
                     e.point.x, e.point.y,
                     elementId,
-                    e.originalEvent?.shiftKey ?? false
+                    (e.originalEvent?.shiftKey || e.originalEvent?.ctrlKey || e.originalEvent?.metaKey) ?? false
                 ).catch(console.error);
             });
 

Alidade.Osm/Handlers/Editing/GridifyWay.cs

@@ -2,24 +2,25 @@ namespace Alidade.Osm.Handlers.Editing;
 
 /// <inheritdoc />
 public sealed class GridifyWay(EditBufferStateService editBufferState)
-    : IRequestHandler<GridifyWay.Command, CommandResult>
+    : IRequestHandler<GridifyWay.Query, QueryResult<IReadOnlyList<OsmElementRef>>>
 {
-    static GridifyWay() => UndoDescriptions.Register<Command>("Gridify");
+    static GridifyWay() => UndoDescriptions.Register<Query>("Gridify");
 
     /// <summary>
     ///   Splits a closed way into a grid of equal rectangular sub-areas.
     ///   The grid is rotated by <see cref="RotationDeg"/> degrees (clockwise from east in
-    ///   the local flat-Earth projection). The original way is replaced by the new cell ways.
+    ///   the local flat-Earth projection). The original way is replaced by the new cell ways,
+    ///   whose refs are returned on success.
     /// </summary>
     /// <param name="WayId">The ID of the closed way to gridify.</param>
     /// <param name="Rows">Number of rows in the output grid.</param>
     /// <param name="Cols">Number of columns in the output grid.</param>
     /// <param name="RotationDeg">Grid rotation in degrees.</param>
-    public record Command(long WayId, int Rows, int Cols, double RotationDeg)
-        : IRequest<CommandResult>, IUndoableCommand;
+    public record Query(long WayId, int Rows, int Cols, double RotationDeg)
+        : IRequest<QueryResult<IReadOnlyList<OsmElementRef>>>, IUndoableCommand;
 
     /// <inheritdoc />
-    public Task<CommandResult> Handle(Command request, CancellationToken cancellationToken)
+    public Task<QueryResult<IReadOnlyList<OsmElementRef>>> Handle(Query request, CancellationToken cancellationToken)
     {
         GridifyResult result = GeometryService.Gridify(
             request.WayId,
@@ -31,13 +32,13 @@ public Task<CommandResult> Handle(Command request, CancellationToken cancellatio
 
         if (result.CellNodeRefs.Count == 0)
         {
-            return Task.FromResult(CommandResult.Fail("The selected way cannot be gridified. Select a single closed way."));
+            return Task.FromResult(QueryResult<IReadOnlyList<OsmElementRef>>.Fail("The selected way cannot be gridified. Select a single closed way."));
         }
 
         EditBufferState state = editBufferState.State;
         if (!state.Ways.TryGetValue(request.WayId, out OsmWay? originalWay))
         {
-            return Task.FromResult(CommandResult.Pass());
+            return Task.FromResult(QueryResult<IReadOnlyList<OsmElementRef>>.Fail());
         }
 
         ImmutableDictionary<long, OsmNode> nodeDict = state.Nodes;
@@ -57,13 +58,15 @@ public Task<CommandResult> Handle(Command request, CancellationToken cancellatio
         }
 
         IReadOnlyDictionary<string, string> tags = originalWay.Tags;
-        foreach (IReadOnlyList<GridifyNodeRef> cellRefs in result.CellNodeRefs)
+        List<OsmElementRef> cellRefs = [];
+        foreach (IReadOnlyList<GridifyNodeRef> cellNodeRefs in result.CellNodeRefs)
         {
-            long[] cellNodeIds = [.. cellRefs.Select(r =>
+            long[] cellNodeIds = [.. cellNodeRefs.Select(r =>
                 r.IsExisting ? r.ExistingNodeId : newNodeIds[r.NewNodeIndex])];
             OsmWay cellWay = new(nextId, 1, null, null, null, cellNodeIds, tags.ToImmutableDictionary());
             wayDict = wayDict.SetItem(nextId, cellWay);
             editStates = editStates.SetItem(cellWay.Ref, EditState.Created);
+            cellRefs.Add(cellWay.Ref);
             nextId--;
         }
 
@@ -86,6 +89,7 @@ public Task<CommandResult> Handle(Command request, CancellationToken cancellatio
             EditStates = editStates,
             NextNegativeId = nextId
         });
-        return Task.FromResult(CommandResult.Pass());
+
+        return Task.FromResult<QueryResult<IReadOnlyList<OsmElementRef>>>(cellRefs);
     }
 }

Alidade.Osm/Handlers/Tagging/BulkUpdateTags.cs

@@ -0,0 +1,59 @@
+namespace Alidade.Osm.Handlers.Tagging;
+
+/// <inheritdoc />
+public sealed class BulkUpdateTags(EditBufferStateService editBufferState)
+    : IRequestHandler<BulkUpdateTags.Command, CommandResult>
+{
+    static BulkUpdateTags() => UndoDescriptions.Register<Command>("Edit tags");
+
+    /// <summary>
+    ///   Replaces the tag set on each target element in a single atomic operation,
+    ///   producing one entry on the undo stack regardless of how many elements are updated.
+    /// </summary>
+    /// <param name="Updates">
+    ///   The list of elements to update, each paired with its complete new tag set.
+    /// </param>
+    public record Command(IReadOnlyList<(OsmElementRef Target, IReadOnlyDictionary<string, string> NewTags)> Updates)
+        : IRequest<CommandResult>, IUndoableCommand;
+
+    /// <inheritdoc />
+    public Task<CommandResult> Handle(Command request, CancellationToken cancellationToken)
+    {
+        EditBufferState state = editBufferState.State;
+
+        foreach ((OsmElementRef target, IReadOnlyDictionary<string, string> newTags) in request.Updates)
+        {
+            ImmutableDictionary<string, string> tags = newTags.ToImmutableDictionary();
+
+            EditState es = state.EditStates.TryGetValue(target, out EditState existing) && existing == EditState.Created
+                ? EditState.Created
+                : EditState.Modified;
+
+            state = target.Type switch
+            {
+                OsmElementTypes.Node when state.Nodes.TryGetValue(target.Id, out OsmNode? n) =>
+                    state with
+                    {
+                        Nodes = state.Nodes.SetItem(n.Id, n with { Tags = tags }),
+                        EditStates = state.EditStates.SetItem(target, es)
+                    },
+                OsmElementTypes.Way when state.Ways.TryGetValue(target.Id, out OsmWay? w) =>
+                    state with
+                    {
+                        Ways = state.Ways.SetItem(w.Id, w with { Tags = tags }),
+                        EditStates = state.EditStates.SetItem(target, es)
+                    },
+                OsmElementTypes.Relation when state.Relations.TryGetValue(target.Id, out OsmRelation? r) =>
+                    state with
+                    {
+                        Relations = state.Relations.SetItem(r.Id, r with { Tags = tags }),
+                        EditStates = state.EditStates.SetItem(target, es)
+                    },
+                _ => state
+            };
+        }
+
+        editBufferState.SetState(state);
+        return Task.FromResult(CommandResult.Pass());
+    }
+}

…idade.Osm/Handlers/Editing/UpdateTags.cs …idade.Osm/Handlers/Tagging/UpdateTags.csAlidade.Osm/Handlers/Editing/UpdateTags.cs renamed to Alidade.Osm/Handlers/Tagging/UpdateTags.cs Alidade.Osm/Handlers/Editing/UpdateTags.cs renamed to Alidade.Osm/Handlers/Tagging/UpdateTags.cs

@@ -1,7 +1,8 @@
-namespace Alidade.Osm.Handlers.Editing;
+namespace Alidade.Osm.Handlers.Tagging;
 
 /// <inheritdoc />
-public class UpdateTags(EditBufferStateService editBufferState) : IRequestHandler<UpdateTags.Command, CommandResult>
+public class UpdateTags(EditBufferStateService editBufferState)
+    : IRequestHandler<UpdateTags.Command, CommandResult>
 {
     static UpdateTags() => UndoDescriptions.Register<Command>("Edit tags");
 

Alidade/Components/Dialogs/ConflictResolutionDialog.razor.cs

@@ -1,4 +1,5 @@
 using Alidade.Osm.Handlers.Editing;
+using Alidade.Osm.Handlers.Tagging;
 
 namespace Alidade.Components.Dialogs;
 

Alidade/Components/Dialogs/GridifyDialog.razor.cs

@@ -206,9 +206,16 @@ private async Task ApplyAsync()
         }
 
         await ClearPreviewAsync();
-        await mediator.Send(new GridifyWay.Command(_wayId.Value, _rows, _cols, _rotation));
+
+        IReadOnlyList<OsmElementRef>? cellWays = (await mediator.Send(
+            new GridifyWay.Query(_wayId.Value, _rows, _cols, _rotation))).Result;
+
         await mediator.Send(new ToggleGridifyDialog.Command());
-        await mediator.Send(new ClearSelection.Command());
+
+        ImmutableHashSet<OsmElementRef> selection = cellWays is not null
+            ? [.. cellWays]
+            : [];
+        selectionState.SetState(selectionState.State with { Selected = selection });
     }
 
     private void Cancel()

Alidade/Components/Panels/MultiSelectInspectorPanel.razor

@@ -0,0 +1,103 @@
+<div class="inspector-panel @(_selected.Count <= 1 ? "inspector-panel-hidden" : string.Empty)">
+
+    <div class="inspector-header">
+        <span class="inspector-title">@_selected.Count Features</span>
+        <div class="inspector-header-actions">
+            <button class="inspector-close" title="Deselect (Escape)" @onclick="OnClose">✕</button>
+        </div>
+    </div>
+
+    @if (_selected.Count > 1)
+    {
+        @* Individual feature list with per-element deselect *@
+        <ul class="multi-inspector-features">
+            @foreach (FeatureItem feature in _features)
+            {
+                FeatureItem captured = feature;
+                <li class="multi-inspector-feature">
+                    <span class="multi-inspector-feature-name">@captured.Label</span>
+                    <button class="multi-inspector-feature-remove" title="Deselect"
+                            @onclick="() => OnDeselectFeature(captured.Ref)">✕</button>
+                </li>
+            }
+        </ul>
+
+        @* Feature Type row with optional preset search *@
+        <div class="inspector-preset-row">
+            @if (_isSearching)
+            {
+                <input @ref="_searchInput"
+                       type="text"
+                       placeholder="Search presets…"
+                       value="@_query"
+                       @oninput="OnQueryChanged"
+                       @onkeydown="OnSearchKeyDown"
+                       class="inspector-search-input" />
+                <button class="inspector-cancel-search" @onclick="CancelSearch" title="Cancel search">✕</button>
+            }
+            else
+            {
+                <span class="inspector-preset-name">@_featureTypeLabel</span>
+                @if (_commonGeometry is not null)
+                {
+                    <button class="inspector-change-preset" @onclick="StartPresetSearch">Change…</button>
+                }
+            }
+        </div>
+
+        @if (_results.Count > 0)
+        {
+            <ul class="inspector-preset-results">
+                @foreach (Preset p in _results)
+                {
+                    Preset captured = p;
+                    <li @onclick="() => ApplyPresetToAllAsync(captured)" class="inspector-preset-result">
+                        <span class="inspector-preset-result-name">@(captured.Name ?? captured.Id)</span>
+                    </li>
+                }
+            </ul>
+        }
+
+        @* Merged tag table *@
+        <div class="inspector-tags-section">
+            <div class="inspector-section-header">Tags (@_mergedTags.Count)</div>
+            <div class="tag-editor">
+                <table class="tag-table">
+                    <thead>
+                        <tr>
+                            <th>Key</th>
+                            <th>Value</th>
+                            <th></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (MergedTag tag in _mergedTags)
+                        {
+                            string key = tag.Key;
+                            string displayValue = tag.IsConsistent ? (tag.CommonValue ?? string.Empty) : string.Empty;
+                            string placeholder = tag.IsConsistent ? string.Empty : "*";
+                            <tr>
+                                <td class="tag-key">
+                                    <input type="text" value="@key"
+                                           @onchange="@(e => OnKeyChanged(key, e.Value?.ToString() ?? string.Empty))" />
+                                </td>
+                                <td class="tag-value-cell">
+                                    <input type="text"
+                                           value="@displayValue"
+                                           placeholder="@placeholder"
+                                           @onchange="@(e => OnValueChanged(key, e.Value?.ToString() ?? string.Empty))"
+                                           class="tag-value @(tag.IsConsistent ? string.Empty : "tag-value--multiple")" />
+                                </td>
+                                <td>
+                                    <button class="tag-delete" @onclick="@(() => OnDeleteTag(key))">✕</button>
+                                </td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+                <button class="tag-add" @onclick="OnAddTag">+ Add tag</button>
+            </div>
+        </div>
+    }
+
+</div>