From a3475251b80da3f7cd6a100dfaad61e43cd9592e Mon Sep 17 00:00:00 2001
From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com>
Date: Mon, 13 Jul 2020 13:22:32 -0400
Subject: [PATCH] Update more of the documentation for touch input

---
 data/core.yaml           | 36 ++++++++++++++++++++----------------
 dist/locales/en.json     | 36 ++++++++++++++++++++----------------
 modules/ui/panes/help.js |  5 ++++-
 3 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index ab32e2187..12efc7194 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -1313,8 +1313,9 @@ en:
     editing:
       title: "Editing & Saving"
       select_h: "Select"
-      select_left_click: "{leftclick} Left-click or {tap_icon} tap on a feature to select it. This will highlight it with a pulsing glow, and the sidebar will display details about that feature, such as its name or address."
-      select_right_click: "{rightclick} Right-click or {longpress_icon} long-press on a feature to display the edit menu, which shows the commands that are available, such as rotating, moving, and deleting."
+      select_left_click: "{leftclick} Left-click or {tap_icon} tap a feature to select it. This will highlight it with a pulsing glow and display further details about it in the sidebar."
+      select_right_click: "{rightclick} Right-click or {longpress_icon} long-press a feature to display the edit menu, which provides commands such as copy, rotate, and delete."
+      select_space: "The `{space}` key can also be used in place of left-click when selecting and drawing."
       multiselect_h: "Multiselect"
       multiselect_shift_click: "`{shift}`+{leftclick} left-click to select several features together.  This makes it easier to move or delete multiple items."
       multiselect_lasso: "Another way to select multiple features is to hold down the `{shift}` key, then press and hold down the {leftclick} left mouse button and drag the mouse to draw a selection lasso. All of the points inside the lasso area will be selected."
@@ -1347,10 +1348,10 @@ en:
       title: Points
       intro: "*Points* can be used to represent features such as shops, restaurants, and monuments. They mark a specific location, and describe what's there."
       add_point_h: "Adding Points"
-      add_point: "To add a point, press the {point_icon} **{point}** button on the toolbar above the map, or press the shortcut key `1`. This will change the mouse cursor to a cross symbol."
-      add_point_finish: "To place the new point on the map with a mouse, position the cursor where the point should go, then {leftclick} left-click or press `{space}`. On a touchscreen, simply {tap_icon} tap the location."
+      add_point: "To add a point, press the {point_icon} **{point}** button on the toolbar above the map, or press the shortcut key `1`."
+      add_point_finish: "Next, place the new point on the map. With a mouse, position the cursor where the point should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location."
       move_point_h: "Moving Points"
-      move_point: "To move a point, place the mouse cursor over the point, then press and hold the {leftclick} left mouse button while dragging the point to its new location."
+      move_point: "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen."
       delete_point_h: "Deleting Points"
       delete_point: "It's OK to delete features that don't exist in the real world. Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it."
       delete_point_command: "To delete a point, {rightclick} right-click or {longpress_icon} long-press the point to show the edit menu, then use the {delete_icon} **{delete}** command."
@@ -1358,11 +1359,12 @@ en:
       title: Lines
       intro: "*Lines* are used to represent features such as roads, railroads, and rivers. Lines should be drawn down the center of the feature that they represent."
       add_line_h: "Adding Lines"
-      add_line: "To add a line, press the {line_icon} **{line}** button on the toolbar above the map, or press the shortcut key `2`. This will change the mouse cursor to a cross symbol."
-      add_line_draw: "Next, position the mouse cursor where the line should begin and {leftclick} left-click or press `{space}` to begin placing nodes along the line. Continue placing more nodes by clicking or pressing `{space}`. While drawing, you can zoom in or drag the map in order to add more detail."
-      add_line_finish: "To finish a line, press `{return}` or click again on the last node."
+      add_line: "To add a line, press the {line_icon} **{line}** button on the toolbar above the map, or press the shortcut key `2`."
+      add_line_draw: "Next, mark the line's starting location. With a mouse, position the cursor where the line should begin and {leftclick} left-click to place a node. On a touchscreen, {tap_icon} tap the location."
+      add_line_continue: "Continue placing nodes by {leftclick} clicking or {tap_icon} tapping along the shape of the line. While drawing, you can zoom in or drag the map in order to add more detail."
+      add_line_finish: "To finish a line, click or tap on the last node again or press `{return}`."
       modify_line_h: "Modifying Lines"
-      modify_line_dragnode: "Often you'll see lines that aren't shaped correctly, for example a road that does not match up with the background imagery. To adjust the shape of a line, first {leftclick} left-click to select it. All nodes of the line will be drawn as small circles. You can then drag the nodes to better locations."
+      modify_line_dragnode: "Often you'll see lines that aren't shaped correctly, for example a road that does not match up with the background imagery. To adjust the shape of a line, first select it. All nodes of the line will be drawn as small circles. You can then drag the nodes to better locations."
       modify_line_addnode: "You can also create new nodes along a line by {leftclick}**x2** double-clicking or {doubletap_icon} double-tapping the line, or by dragging the small triangles at the midpoints between nodes."
       connect_line_h: "Connecting Lines"
       connect_line: "Having roads connected properly is important for the map and essential for providing driving directions."
@@ -1383,14 +1385,15 @@ en:
       point_or_area_h: "Points or Areas?"
       point_or_area: "Many features can be represented as points or areas. You should map buildings and property outlines as areas whenever possible. Place points inside a building area to represent businesses, amenities, and other features located inside the building."
       add_area_h: "Adding Areas"
-      add_area_command: "To add an area, press the {area_icon} **{area}** button on the toolbar above the map, or press the shortcut key `3`. This will change the mouse cursor to a cross symbol."
-      add_area_draw: "Next, position the mouse cursor at one of the corners of the feature and {leftclick} left-click or press `{space}` to begin placing nodes around the outer edge of the area. Continue placing more nodes by clicking or pressing `{space}`. While drawing, you can zoom in or drag the map in order to add more detail."
-      add_area_finish: "To finish an area, press `{return}` or click again on either the first or last node."
+      add_area_command: "To add an area, press the {area_icon} **{area}** button on the toolbar above the map, or press the shortcut key `3`."
+      add_area_draw: "Next, place the first corner of the area. With a mouse, position the cursor over any corner and {leftclick} left-click to place a node. On a touchscreen, {tap_icon} tap the location."
+      add_area_continue: "Continue placing nodes by {leftclick} clicking or {tap_icon} tapping along the edge of the area. While drawing, you can zoom in or drag the map in order to add more detail."
+      add_area_finish: "To finish an area, click or tap on the first or last node again or press `{return}`."
       square_area_h: "Square Corners"
       square_area_command: "Many area features like buildings have square corners. To square the corners of an area, {rightclick} right-click or {longpress_icon} long-press the edge of the area and select the {orthogonalize_icon} **{orthogonalize}** command from the edit menu."
       modify_area_h: "Modifying Areas"
-      modify_area_dragnode: "Often you'll see areas that aren't shaped correctly, for example a building that does not match up with the background imagery. To adjust the shape of an area, first {leftclick} left-click to select it. All nodes of the area will be drawn as small circles. You can then drag the nodes to better locations."
-      modify_area_addnode: "You can also create new nodes along an area either by {leftclick}**x2** double-clicking on the edge of the area or by dragging the small triangles at the midpoints between nodes."
+      modify_area_dragnode: "Often you'll see areas that aren't shaped correctly, for example a building that does not match up with the background imagery. To adjust the shape of an area, first select it. All nodes of the area will be drawn as small circles. You can then drag the nodes to better locations."
+      modify_area_addnode: "You can also create new nodes along an area by {leftclick}**x2** double-clicking or {doubletap_icon} double-tapping an edge, or by dragging the small triangles at the midpoints between nodes."
       delete_area_h: "Deleting Areas"
       delete_area: "If an area is entirely incorrect, for example a building that doesn't exist in the real world, it's OK to delete it. Be cautious when deleting features - the background imagery you are using might be outdated, and a building that looks wrong could simply be newly built."
       delete_area_command: "To delete an area, {rightclick} right-click or {longpress_icon} long-press the area to show the edit menu, then use the {delete_icon} **{delete}** command."
@@ -1422,8 +1425,9 @@ en:
       title: Notes
       intro: "*Notes* are used to alert other users that a feature requires fixing or attention. Notes mark a specific location on the map. To view existing notes or add new ones, open the {data_icon} **{map_data}** panel and enable the {osm_notes} layer."
       add_note_h: "Adding Notes"
-      add_note: "To add a new note, press the {note_icon} **{note}** button on the toolbar above the map, or press the shortcut key `{add_note_key}`. This will change the mouse cursor to a cross symbol. To place the new note on the map, position the mouse cursor where the note should go, then {leftclick} left-click or press `{space}`."
-      move_note: "Only new notes can be moved. To move a note, place the mouse cursor over the new note, then press and hold the {leftclick} left mouse button while dragging the note to its new location."
+      add_note: "To add a new note, press the {note_icon} **{note}** button on the toolbar above the map, or press the shortcut key `{add_note_key}`."
+      place_note: "Next, place the new note on the map. With a mouse, position the cursor where the note should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location."
+      move_note: "To move a note, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen. Only new notes can be moved."
       update_note_h: "Closing, Reopening, and Commenting"
       update_note: "An existing note can be updated by closing it, reopening it, or adding a comment to it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original issue is not resolved."
       save_note_h: "Saving Notes"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 4776c260b..cf2684c27 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1649,8 +1649,9 @@
             "editing": {
                 "title": "Editing & Saving",
                 "select_h": "Select",
-                "select_left_click": "{leftclick} Left-click or {tap_icon} tap on a feature to select it. This will highlight it with a pulsing glow, and the sidebar will display details about that feature, such as its name or address.",
-                "select_right_click": "{rightclick} Right-click or {longpress_icon} long-press on a feature to display the edit menu, which shows the commands that are available, such as rotating, moving, and deleting.",
+                "select_left_click": "{leftclick} Left-click or {tap_icon} tap a feature to select it. This will highlight it with a pulsing glow and display further details about it in the sidebar.",
+                "select_right_click": "{rightclick} Right-click or {longpress_icon} long-press a feature to display the edit menu, which provides commands such as copy, rotate, and delete.",
+                "select_space": "The `{space}` key can also be used in place of left-click when selecting and drawing.",
                 "multiselect_h": "Multiselect",
                 "multiselect_shift_click": "`{shift}`+{leftclick} left-click to select several features together.  This makes it easier to move or delete multiple items.",
                 "multiselect_lasso": "Another way to select multiple features is to hold down the `{shift}` key, then press and hold down the {leftclick} left mouse button and drag the mouse to draw a selection lasso. All of the points inside the lasso area will be selected.",
@@ -1685,10 +1686,10 @@
                 "title": "Points",
                 "intro": "*Points* can be used to represent features such as shops, restaurants, and monuments. They mark a specific location, and describe what's there.",
                 "add_point_h": "Adding Points",
-                "add_point": "To add a point, press the {point_icon} **{point}** button on the toolbar above the map, or press the shortcut key `1`. This will change the mouse cursor to a cross symbol.",
-                "add_point_finish": "To place the new point on the map with a mouse, position the cursor where the point should go, then {leftclick} left-click or press `{space}`. On a touchscreen, simply {tap_icon} tap the location.",
+                "add_point": "To add a point, press the {point_icon} **{point}** button on the toolbar above the map, or press the shortcut key `1`.",
+                "add_point_finish": "Next, place the new point on the map. With a mouse, position the cursor where the point should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location.",
                 "move_point_h": "Moving Points",
-                "move_point": "To move a point, place the mouse cursor over the point, then press and hold the {leftclick} left mouse button while dragging the point to its new location.",
+                "move_point": "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen.",
                 "delete_point_h": "Deleting Points",
                 "delete_point": "It's OK to delete features that don't exist in the real world. Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it.",
                 "delete_point_command": "To delete a point, {rightclick} right-click or {longpress_icon} long-press the point to show the edit menu, then use the {delete_icon} **{delete}** command."
@@ -1697,11 +1698,12 @@
                 "title": "Lines",
                 "intro": "*Lines* are used to represent features such as roads, railroads, and rivers. Lines should be drawn down the center of the feature that they represent.",
                 "add_line_h": "Adding Lines",
-                "add_line": "To add a line, press the {line_icon} **{line}** button on the toolbar above the map, or press the shortcut key `2`. This will change the mouse cursor to a cross symbol.",
-                "add_line_draw": "Next, position the mouse cursor where the line should begin and {leftclick} left-click or press `{space}` to begin placing nodes along the line. Continue placing more nodes by clicking or pressing `{space}`. While drawing, you can zoom in or drag the map in order to add more detail.",
-                "add_line_finish": "To finish a line, press `{return}` or click again on the last node.",
+                "add_line": "To add a line, press the {line_icon} **{line}** button on the toolbar above the map, or press the shortcut key `2`.",
+                "add_line_draw": "Next, mark the line's starting location. With a mouse, position the cursor where the line should begin and {leftclick} left-click to place a node. On a touchscreen, {tap_icon} tap the location.",
+                "add_line_continue": "Continue placing nodes by {leftclick} clicking or {tap_icon} tapping along the shape of the line. While drawing, you can zoom in or drag the map in order to add more detail.",
+                "add_line_finish": "To finish a line, click or tap on the last node again or press `{return}`.",
                 "modify_line_h": "Modifying Lines",
-                "modify_line_dragnode": "Often you'll see lines that aren't shaped correctly, for example a road that does not match up with the background imagery. To adjust the shape of a line, first {leftclick} left-click to select it. All nodes of the line will be drawn as small circles. You can then drag the nodes to better locations.",
+                "modify_line_dragnode": "Often you'll see lines that aren't shaped correctly, for example a road that does not match up with the background imagery. To adjust the shape of a line, first select it. All nodes of the line will be drawn as small circles. You can then drag the nodes to better locations.",
                 "modify_line_addnode": "You can also create new nodes along a line by {leftclick}**x2** double-clicking or {doubletap_icon} double-tapping the line, or by dragging the small triangles at the midpoints between nodes.",
                 "connect_line_h": "Connecting Lines",
                 "connect_line": "Having roads connected properly is important for the map and essential for providing driving directions.",
@@ -1723,14 +1725,15 @@
                 "point_or_area_h": "Points or Areas?",
                 "point_or_area": "Many features can be represented as points or areas. You should map buildings and property outlines as areas whenever possible. Place points inside a building area to represent businesses, amenities, and other features located inside the building.",
                 "add_area_h": "Adding Areas",
-                "add_area_command": "To add an area, press the {area_icon} **{area}** button on the toolbar above the map, or press the shortcut key `3`. This will change the mouse cursor to a cross symbol.",
-                "add_area_draw": "Next, position the mouse cursor at one of the corners of the feature and {leftclick} left-click or press `{space}` to begin placing nodes around the outer edge of the area. Continue placing more nodes by clicking or pressing `{space}`. While drawing, you can zoom in or drag the map in order to add more detail.",
-                "add_area_finish": "To finish an area, press `{return}` or click again on either the first or last node.",
+                "add_area_command": "To add an area, press the {area_icon} **{area}** button on the toolbar above the map, or press the shortcut key `3`.",
+                "add_area_draw": "Next, place the first corner of the area. With a mouse, position the cursor over any corner and {leftclick} left-click to place a node. On a touchscreen, {tap_icon} tap the location.",
+                "add_area_continue": "Continue placing nodes by {leftclick} clicking or {tap_icon} tapping along the edge of the area. While drawing, you can zoom in or drag the map in order to add more detail.",
+                "add_area_finish": "To finish an area, click or tap on the first or last node again or press `{return}`.",
                 "square_area_h": "Square Corners",
                 "square_area_command": "Many area features like buildings have square corners. To square the corners of an area, {rightclick} right-click or {longpress_icon} long-press the edge of the area and select the {orthogonalize_icon} **{orthogonalize}** command from the edit menu.",
                 "modify_area_h": "Modifying Areas",
-                "modify_area_dragnode": "Often you'll see areas that aren't shaped correctly, for example a building that does not match up with the background imagery. To adjust the shape of an area, first {leftclick} left-click to select it. All nodes of the area will be drawn as small circles. You can then drag the nodes to better locations.",
-                "modify_area_addnode": "You can also create new nodes along an area either by {leftclick}**x2** double-clicking on the edge of the area or by dragging the small triangles at the midpoints between nodes.",
+                "modify_area_dragnode": "Often you'll see areas that aren't shaped correctly, for example a building that does not match up with the background imagery. To adjust the shape of an area, first select it. All nodes of the area will be drawn as small circles. You can then drag the nodes to better locations.",
+                "modify_area_addnode": "You can also create new nodes along an area by {leftclick}**x2** double-clicking or {doubletap_icon} double-tapping an edge, or by dragging the small triangles at the midpoints between nodes.",
                 "delete_area_h": "Deleting Areas",
                 "delete_area": "If an area is entirely incorrect, for example a building that doesn't exist in the real world, it's OK to delete it. Be cautious when deleting features - the background imagery you are using might be outdated, and a building that looks wrong could simply be newly built.",
                 "delete_area_command": "To delete an area, {rightclick} right-click or {longpress_icon} long-press the area to show the edit menu, then use the {delete_icon} **{delete}** command."
@@ -1764,8 +1767,9 @@
                 "title": "Notes",
                 "intro": "*Notes* are used to alert other users that a feature requires fixing or attention. Notes mark a specific location on the map. To view existing notes or add new ones, open the {data_icon} **{map_data}** panel and enable the {osm_notes} layer.",
                 "add_note_h": "Adding Notes",
-                "add_note": "To add a new note, press the {note_icon} **{note}** button on the toolbar above the map, or press the shortcut key `{add_note_key}`. This will change the mouse cursor to a cross symbol. To place the new note on the map, position the mouse cursor where the note should go, then {leftclick} left-click or press `{space}`.",
-                "move_note": "Only new notes can be moved. To move a note, place the mouse cursor over the new note, then press and hold the {leftclick} left mouse button while dragging the note to its new location.",
+                "add_note": "To add a new note, press the {note_icon} **{note}** button on the toolbar above the map, or press the shortcut key `{add_note_key}`.",
+                "place_note": "Next, place the new note on the map. With a mouse, position the cursor where the note should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location.",
+                "move_note": "To move a note, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen. Only new notes can be moved.",
                 "update_note_h": "Closing, Reopening, and Commenting",
                 "update_note": "An existing note can be updated by closing it, reopening it, or adding a comment to it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original issue is not resolved.",
                 "save_note_h": "Saving Notes",
diff --git a/modules/ui/panes/help.js b/modules/ui/panes/help.js
index 48924d7d1..e4c4be13d 100644
--- a/modules/ui/panes/help.js
+++ b/modules/ui/panes/help.js
@@ -34,6 +34,7 @@ export function uiPaneHelp(context) {
             'select_h',
             'select_left_click',
             'select_right_click',
+            'select_space',
             'multiselect_h',
             'multiselect_shift_click',
             'multiselect_lasso',
@@ -79,6 +80,7 @@ export function uiPaneHelp(context) {
             'add_line_h',
             'add_line',
             'add_line_draw',
+            'add_line_continue',
             'add_line_finish',
             'modify_line_h',
             'modify_line_dragnode',
@@ -104,6 +106,7 @@ export function uiPaneHelp(context) {
             'add_area_h',
             'add_area_command',
             'add_area_draw',
+            'add_area_continue',
             'add_area_finish',
             'square_area_h',
             'square_area_command',
@@ -142,13 +145,13 @@ export function uiPaneHelp(context) {
             'intro',
             'add_note_h',
             'add_note',
+            'place_note',
             'move_note',
             'update_note_h',
             'update_note',
             'save_note_h',
             'save_note'
         ]],
-
         ['imagery', [
             'intro',
             'sources_h',