Use vertical bar for selecting parent ways instead of command+up arro…

…w (re: #8264) Support pressing vertical bar again to return to node selection
openstreetmap · Jan 6, 2021 · ddf8682 · ddf8682
1 parent b0df313
commit ddf8682
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/data/shortcuts.json b/data/shortcuts.json
@@ -159,8 +159,7 @@
             "text": "shortcuts.browsing.vertex_selected.last"
           },
           {
-            "modifiers": ["⌘"],
-            "shortcuts": ["↑"],
+            "shortcuts": ["|"],
             "text": "shortcuts.browsing.vertex_selected.parent"
           },
           {

diff --git a/modules/modes/select.js b/modules/modes/select.js
@@ -48,6 +48,7 @@ export function modeSelect(context, selectedIDs) {
     // `_focusedParentWayId` is used when we visit a vertex with multiple
     // parents, and we want to remember which parent line we started on.
     var _focusedParentWayId;
+    var _focusedVertexIds;
 
 
     function singular() {
@@ -243,7 +244,7 @@ export function modeSelect(context, selectedIDs) {
             .on(utilKeybinding.minusKeys.map((key) => uiCmd('⇧' + key)), scaleSelection(1/1.05))
             .on(utilKeybinding.minusKeys.map((key) => uiCmd('⇧⌥' + key)), scaleSelection(1/Math.pow(1.05, 5)))
             .on(['\\', 'pause'], focusNextParent)
-            .on(uiCmd('⌘↑'), selectParent)
+            .on('|', selectParent)
             .on('⎋', esc, true);
 
         d3_select(document)
@@ -572,12 +573,27 @@ export function modeSelect(context, selectedIDs) {
 
         function selectParent(d3_event) {
             d3_event.preventDefault();
-            var parents = _focusedParentWayId ? [_focusedParentWayId] : parentWaysIdsOfSelection(false);
-            if (!parents || parents.length === 0) return;
 
-            context.enter(
-                modeSelect(context, parents)
-            );
+            var currentSelectedIds = mode.selectedIDs();
+            var parentIds = _focusedParentWayId ? [_focusedParentWayId] : parentWaysIdsOfSelection(false);
+
+            if (!parentIds.length) {
+                var reselectIds = _focusedVertexIds && _focusedVertexIds.filter(id => context.hasEntity(id));
+
+                if (reselectIds && reselectIds.length) {
+                    if (currentSelectedIds.length === 1) _focusedParentWayId = currentSelectedIds[0];
+                    context.enter(
+                        mode.selectedIDs(_focusedVertexIds)
+                    );
+                }
+            } else {
+
+                context.enter(
+                    mode.selectedIDs(parentIds)
+                );
+                // set this after re-entering the selection since we normally want it cleared on exit
+                _focusedVertexIds = currentSelectedIds;
+            }
         }
     };
 
@@ -587,6 +603,8 @@ export function modeSelect(context, selectedIDs) {
         // we could enter the mode multiple times but it's only new the first time
         _newFeature = false;
 
+        _focusedVertexIds = null;
+
         _operations.forEach(function(operation) {
             if (operation.behavior) {
                 context.uninstall(operation.behavior);

diff --git a/modules/util/keybinding.js b/modules/util/keybinding.js
@@ -370,6 +370,8 @@ utilKeybinding.keyCodes = {
     '+': 107, 'plus': 107,
     // Num-Subtract, or -
     '-': 109, subtract: 109,
+    // Vertical Bar / Pipe
+    '|': 124,
     // Firefox Plus
     'ffplus': 171,
     // Firefox Minus