v3 UI

data/core.yaml

@@ -12,11 +12,42 @@ en:
     text: text
     deselect: deselect
   toolbar:
-    inspect: Inspect
     undo_redo: Undo / Redo
     recent: Recent
     favorites: Favorites
     add_feature: Add Feature
+    finish: Finish
+    generic:
+      title: Geometries
+    geometry:
+      key: T
+    repeat:
+      title: Repeat
+      tooltip:
+        point: "Add another {feature} after this one."
+        way: "Start another {feature} after finishing this one."
+      key: R
+    segments:
+      title: Segments
+      straight:
+        title: Straight
+      orthogonal:
+        title: Rectangular
+      key: A
+    structure:
+      none:
+        title: None
+      key: S
+    support:
+      title: Support
+      pole:
+        title: Pole
+      tower:
+        title: Tower
+      key: S
+    toolbox:
+      title: Tools
+      tooltip: Customize the toolbar.
   title:
     format:
       context: "{base} – {context}"
@@ -25,9 +56,10 @@ en:
     labeled_and_more: "{labeled} and {count} more"
   modes:
     add_feature:
-      title: Add a feature
-      description: "Search for features to add to the map."
-      key: Tab
+      search_placeholder: Search feature types
+      description: "Browse features to add to the map."
+      # The hotkey to open the Add Feature preset browser. Expect the key adjacent to the number row.
+      key: "`"
       result: "{count} result"
       results: "{count} results"
     add_area:
@@ -45,6 +77,8 @@ en:
       description: "Add restaurants, monuments, postal boxes or other points to the map."
       tail: Click on the map to add a point.
       filter_tooltip: points
+      warning:
+        vertex_placement: This must be placed along a line or area.
     add_note:
       title: Note
       label: Add Note
@@ -442,9 +476,6 @@ en:
   loading_auth: "Connecting to OpenStreetMap..."
   report_a_bug: Report a bug
   help_translate: Help translate
-  sidebar:
-    key: '`'
-    tooltip: Toggle the sidebar.
   feature_info:
     hidden_warning: "{count} hidden features"
     hidden_details: "These features are currently hidden: {details}"

dist/locales/en.json

@@ -14,11 +14,55 @@
             "deselect": "deselect"
         },
         "toolbar": {
-            "inspect": "Inspect",
             "undo_redo": "Undo / Redo",
             "recent": "Recent",
             "favorites": "Favorites",
-            "add_feature": "Add Feature"
+            "add_feature": "Add Feature",
+            "finish": "Finish",
+            "generic": {
+                "title": "Geometries"
+            },
+            "geometry": {
+                "key": "T"
+            },
+            "repeat": {
+                "title": "Repeat",
+                "tooltip": {
+                    "point": "Add another {feature} after this one.",
+                    "way": "Start another {feature} after finishing this one."
+                },
+                "key": "R"
+            },
+            "segments": {
+                "title": "Segments",
+                "straight": {
+                    "title": "Straight"
+                },
+                "orthogonal": {
+                    "title": "Rectangular"
+                },
+                "key": "A"
+            },
+            "structure": {
+                "none": {
+                    "title": "None"
+                },
+                "key": "S"
+            },
+            "support": {
+                "title": "Support",
+                "pole": {
+                    "title": "Pole"
+                },
+                "tower": {
+                    "title": "Tower"
+                },
+                "key": "S"
+            },
+            "toolbox": {
+                "title": "Tools",
+                "tooltip": "Customize the toolbar."
+            }
         },
         "title": {
             "format": {
@@ -30,9 +74,9 @@
         },
         "modes": {
             "add_feature": {
-                "title": "Add a feature",
-                "description": "Search for features to add to the map.",
-                "key": "Tab",
+                "search_placeholder": "Search feature types",
+                "description": "Browse features to add to the map.",
+                "key": "`",
                 "result": "{count} result",
                 "results": "{count} results"
             },
@@ -52,7 +96,10 @@
                 "title": "Point",
                 "description": "Add restaurants, monuments, postal boxes or other points to the map.",
                 "tail": "Click on the map to add a point.",
-                "filter_tooltip": "points"
+                "filter_tooltip": "points",
+                "warning": {
+                    "vertex_placement": "This must be placed along a line or area."
+                }
             },
             "add_note": {
                 "title": "Note",
@@ -574,10 +621,6 @@
         "loading_auth": "Connecting to OpenStreetMap...",
         "report_a_bug": "Report a bug",
         "help_translate": "Help translate",
-        "sidebar": {
-            "key": "`",
-            "tooltip": "Toggle the sidebar."
-        },
         "feature_info": {
             "hidden_warning": "{count} hidden features",
             "hidden_details": "These features are currently hidden: {details}"

modules/behavior/add_way.js

@@ -1,47 +1,36 @@
 import { dispatch as d3_dispatch } from 'd3-dispatch';
 
 import { behaviorDraw } from './draw';
-import { modeBrowse } from '../modes/browse';
 import { utilRebind } from '../util/rebind';
 
 
 export function behaviorAddWay(context) {
-    var dispatch = d3_dispatch('start', 'startFromWay', 'startFromNode');
+    var dispatch = d3_dispatch('start', 'startFromWay', 'startFromNode', 'cancel', 'finish');
     var draw = behaviorDraw(context);
 
     function behavior(surface) {
         draw.on('click', function() { dispatch.apply('start', this, arguments); })
             .on('clickWay', function() { dispatch.apply('startFromWay', this, arguments); })
             .on('clickNode', function() { dispatch.apply('startFromNode', this, arguments); })
-            .on('cancel', behavior.cancel)
-            .on('finish', behavior.cancel);
+            .on('cancel', function() { dispatch.apply('cancel', this, arguments); })
+            .on('finish', function() { dispatch.apply('finish', this, arguments); });
 
         context.map()
             .dblclickZoomEnable(false);
 
         surface.call(draw);
     }
 
-
     behavior.off = function(surface) {
-        surface.call(draw.off);
-    };
-
+        context.map().dblclickZoomEnable(true);
 
-    behavior.cancel = function() {
-        window.setTimeout(function() {
-            context.map().dblclickZoomEnable(true);
-        }, 1000);
-
-        context.enter(modeBrowse(context));
+        surface.call(draw.off);
     };
 
-
     behavior.tail = function(text) {
         draw.tail(text);
         return behavior;
     };
 
-
     return utilRebind(behavior, dispatch, 'on');
 }

modules/behavior/draw.js

@@ -19,7 +19,8 @@ var _lastSpace = null;
 
 export function behaviorDraw(context) {
     var dispatch = d3_dispatch(
-        'move', 'click', 'clickWay', 'clickNode', 'undo', 'cancel', 'finish'
+        'move', 'click', 'clickWay', 'clickNode', 'undo', 'cancel', 'finish',
+        'rejectedVertexAsPoint'
     );
 
     var keybinding = utilKeybinding('draw');
@@ -138,7 +139,12 @@ export function behaviorDraw(context) {
                 dispatch.call('clickWay', this, choice.loc, edge, d);
                 return;
             }
-        } else if (mode.id !== 'add-point' || mode.preset.matchGeometry('point')) {
+        } else {
+            if (mode.id === 'add-point' && !mode.preset.matchGeometry('point')) {
+                // attempting to add a vertex as an independent point
+                dispatch.call('rejectedVertexAsPoint', this);
+                return;
+            }
             var locLatLng = context.projection.invert(loc);
             dispatch.call('click', this, locLatLng, d);
         }