diff --git a/data/core.yaml b/data/core.yaml index a9283d4f6..400831050 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -1933,9 +1933,9 @@ en: title: "Navigation" map_info: "The main map area shows OpenStreetMap data on top of a background." drag: "You can click-and-drag the map with the {leftclick} left mouse button to move it around. You can also use the arrow keys on a keyboard. **Drag the map!**" - drag_touch: "You can {longpress_icon} tap-and-drag the map to move it around. You can also use the arrow keys on a keyboard. **Drag the map!**" + drag_touch: "You can {touchdrag_icon} tap-and-drag the map to move it around. You can also use the arrow keys on a keyboard. **Drag the map!**" zoom: "You can zoom the map by scrolling with a mouse wheel or trackpad, or by pressing the {plus} / {minus} buttons. **Zoom the map!**" - zoom_touch: "You can zoom the map by pinching it with two fingers, double-tapping a location, or pressing the {plus} / {minus} buttons. **Zoom the map!**" + zoom_touch: "You can zoom the map by pinching it with two fingers, {doubletap_icon} double-tapping a location, or pressing the {plus} / {minus} buttons. **Zoom the map!**" features: "We use the word *features* to describe the things that appear on the map. Anything in the real world can be mapped as a feature on OpenStreetMap." points_lines_areas: "Map features are represented using *points, lines, or areas.*" nodes_ways: "In OpenStreetMap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*." @@ -2009,9 +2009,9 @@ en: did_name_road: "Looks good! Next we will learn how to update the shape of a line." update_line: "Sometimes you will need to change the shape of an existing line. Here is a road that doesn't look quite right." add_node: "We can add some nodes to this line to improve its shape. One way to add a node is to double-click the line where you want to add a node. **Double-click on the line to create a new node.**" - add_node_touch: "We can add some nodes to this line to improve its shape. One way to add a node is to {tap_icon} double-tap the line where you want to add a node. **Double-tap on the line to create a new node.**" + add_node_touch: "We can add some nodes to this line to improve its shape. One way to add a node is to {doubletap_icon} double-tap the line where you want to add a node. **Double-tap on the line to create a new node.**" start_drag_endpoint: "When a line is selected, you can adjust any of its nodes by clicking and holding down the {leftclick} left mouse button while you drag." - start_drag_endpoint_touch: "When a line is selected, you can {longpress_icon} tap-and-drag any of its nodes to adjust them." + start_drag_endpoint_touch: "When a line is selected, you can {touchdrag_icon} tap-and-drag any of its nodes to adjust them." drag_to_intersection: "**Drag the endpoint to the place where these roads should intersect.**" spot_looks_good: "This spot looks good." finish_drag_endpoint: "**Release the mouse button to finish dragging.**" diff --git a/dist/locales/en.json b/dist/locales/en.json index 72f378532..6c86b9509 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2408,9 +2408,9 @@ "title": "Navigation", "map_info": "The main map area shows OpenStreetMap data on top of a background.", "drag": "You can click-and-drag the map with the {leftclick} left mouse button to move it around. You can also use the arrow keys on a keyboard. **Drag the map!**", - "drag_touch": "You can {longpress_icon} tap-and-drag the map to move it around. You can also use the arrow keys on a keyboard. **Drag the map!**", + "drag_touch": "You can {touchdrag_icon} tap-and-drag the map to move it around. You can also use the arrow keys on a keyboard. **Drag the map!**", "zoom": "You can zoom the map by scrolling with a mouse wheel or trackpad, or by pressing the {plus} / {minus} buttons. **Zoom the map!**", - "zoom_touch": "You can zoom the map by pinching it with two fingers, double-tapping a location, or pressing the {plus} / {minus} buttons. **Zoom the map!**", + "zoom_touch": "You can zoom the map by pinching it with two fingers, {doubletap_icon} double-tapping a location, or pressing the {plus} / {minus} buttons. **Zoom the map!**", "features": "We use the word *features* to describe the things that appear on the map. Anything in the real world can be mapped as a feature on OpenStreetMap.", "points_lines_areas": "Map features are represented using *points, lines, or areas.*", "nodes_ways": "In OpenStreetMap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*.", @@ -2487,9 +2487,9 @@ "did_name_road": "Looks good! Next we will learn how to update the shape of a line.", "update_line": "Sometimes you will need to change the shape of an existing line. Here is a road that doesn't look quite right.", "add_node": "We can add some nodes to this line to improve its shape. One way to add a node is to double-click the line where you want to add a node. **Double-click on the line to create a new node.**", - "add_node_touch": "We can add some nodes to this line to improve its shape. One way to add a node is to {tap_icon} double-tap the line where you want to add a node. **Double-tap on the line to create a new node.**", + "add_node_touch": "We can add some nodes to this line to improve its shape. One way to add a node is to {doubletap_icon} double-tap the line where you want to add a node. **Double-tap on the line to create a new node.**", "start_drag_endpoint": "When a line is selected, you can adjust any of its nodes by clicking and holding down the {leftclick} left mouse button while you drag.", - "start_drag_endpoint_touch": "When a line is selected, you can {longpress_icon} tap-and-drag any of its nodes to adjust them.", + "start_drag_endpoint_touch": "When a line is selected, you can {touchdrag_icon} tap-and-drag any of its nodes to adjust them.", "drag_to_intersection": "**Drag the endpoint to the place where these roads should intersect.**", "spot_looks_good": "This spot looks good.", "finish_drag_endpoint": "**Release the mouse button to finish dragging.**", diff --git a/modules/ui/intro/helper.js b/modules/ui/intro/helper.js index 4b293e856..f3af18cf4 100644 --- a/modules/ui/intro/helper.js +++ b/modules/ui/intro/helper.js @@ -76,7 +76,9 @@ export function helpString(id, replacements) { leftclick: icon('#iD-walkthrough-mouse-left', 'pre-text operation'), rightclick: icon('#iD-walkthrough-mouse-right', 'pre-text operation'), tap_icon: icon('#iD-walkthrough-tap', 'pre-text operation'), + doubletap_icon: icon('#iD-walkthrough-doubletap', 'pre-text operation'), longpress_icon: icon('#iD-walkthrough-longpress', 'pre-text operation'), + touchdrag_icon: icon('#iD-walkthrough-touchdrag-right', 'pre-text operation'), // insert keys; may be localized and platform-dependent shift: uiCmd.display('⇧'), diff --git a/svg/iD-sprite/graphics/walkthrough-doubletap.svg b/svg/iD-sprite/graphics/walkthrough-doubletap.svg new file mode 100644 index 000000000..849f7a7d2 --- /dev/null +++ b/svg/iD-sprite/graphics/walkthrough-doubletap.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/graphics/walkthrough-longpress.svg b/svg/iD-sprite/graphics/walkthrough-longpress.svg index 64257248b..6e9b4473f 100644 --- a/svg/iD-sprite/graphics/walkthrough-longpress.svg +++ b/svg/iD-sprite/graphics/walkthrough-longpress.svg @@ -1,5 +1,5 @@ - - + + diff --git a/svg/iD-sprite/graphics/walkthrough-tap.svg b/svg/iD-sprite/graphics/walkthrough-tap.svg index 0807f37b6..d65e39dc7 100644 --- a/svg/iD-sprite/graphics/walkthrough-tap.svg +++ b/svg/iD-sprite/graphics/walkthrough-tap.svg @@ -1,5 +1,5 @@ - - + + diff --git a/svg/iD-sprite/graphics/walkthrough-touchdrag-right.svg b/svg/iD-sprite/graphics/walkthrough-touchdrag-right.svg new file mode 100644 index 000000000..976117267 --- /dev/null +++ b/svg/iD-sprite/graphics/walkthrough-touchdrag-right.svg @@ -0,0 +1,5 @@ + + + + +