Adjust language, keep Wood road selected when editing midpoint/endpoint

data/core.yaml

@@ -937,7 +937,7 @@ en:
     lines:
       title: "Lines"
       add_line: "Lines are used to represent features such as roads, railroads, and rivers. **Click the {button} Line button to add a new line.**"
-      start_line: "Here is a road that is missing. Let's add it! In OpenStreetMap, lines should be drawn down the center of the road. You can drag the map while drawing if necessary. **Start a new line by clicking on the end of the road.**"
+      start_line: "Here is a road that is missing. Let's add it! In OpenStreetMap, lines should be drawn down the center of the road. You can drag and zoom the map while drawing if necessary. **Start a new line by clicking at the top end of this missing road.**"
       intersect: "Click or press spacebar to add more nodes to the line. Roads, and many other types of lines, are part of a larger network. It is important for these lines to be connected properly in order for routing applications to work. **Click on {name} to create an intersection connecting the two lines.**"
       retry_intersect: "The road needs to intersect {name}. Let's try again!"
       continue_line: "Continue drawing the line for the new road. Remember that you can drag and zoom the map if needed. When you are finished drawing, click on the last node again. **Finish drawing the road.**"

dist/locales/en.json

@@ -800,7 +800,7 @@
             "lines": {
                 "title": "Lines",
                 "add_line": "Lines are used to represent features such as roads, railroads, and rivers. **Click the {button} Line button to add a new line.**",
-                "start_line": "Here is a road that is missing. Let's add it! In OpenStreetMap, lines should be drawn down the center of the road. You can drag the map while drawing if necessary. **Start a new line by clicking on the end of the road.**",
+                "start_line": "Here is a road that is missing. Let's add it! In OpenStreetMap, lines should be drawn down the center of the road. You can drag and zoom the map while drawing if necessary. **Start a new line by clicking at the top end of this missing road.**",
                 "intersect": "Click or press spacebar to add more nodes to the line. Roads, and many other types of lines, are part of a larger network. It is important for these lines to be connected properly in order for routing applications to work. **Click on {name} to create an intersection connecting the two lines.**",
                 "retry_intersect": "The road needs to intersect {name}. Let's try again!",
                 "continue_line": "Continue drawing the line for the new road. Remember that you can drag and zoom the map if needed. When you are finished drawing, click on the last node again. **Finish drawing the road.**",

modules/ui/intro/line.js

@@ -387,6 +387,9 @@ export function uiIntroLine(context, reveal) {
         if (!context.hasEntity(woodRoadId) || !context.hasEntity(woodRoadEndId)) {
             return continueTo(updateLine);
         }
+        if (context.selectedIDs().indexOf(woodRoadId) === -1) {
+            context.enter(modeSelect(context, [woodRoadId]));
+        }
 
         var padding = 100 * Math.pow(2, context.map().zoom() - 19);
 
@@ -407,8 +410,16 @@ export function uiIntroLine(context, reveal) {
             }
         });
 
+        context.on('enter.intro', function(mode) {
+            if (mode.id !== 'select') {
+                // keep Wood Road selected so endpoint stays draggable..
+                context.enter(modeSelect(context, [woodRoadId]));
+            }
+        });
+
         function continueTo(nextStep) {
             context.map().on('move.intro drawn.intro', null);
+            context.on('enter.intro', null);
             nextStep();
         }
     }
@@ -453,6 +464,9 @@ export function uiIntroLine(context, reveal) {
         if (!context.hasEntity(woodRoadId) || !context.hasEntity(woodRoadEndId)) {
             return continueTo(updateLine);
         }
+        if (context.selectedIDs().indexOf(woodRoadId) === -1) {
+            context.enter(modeSelect(context, [woodRoadId]));
+        }
 
         var padding = 80 * Math.pow(2, context.map().zoom() - 19);
 

modules/ui/intro/navigation.js

@@ -8,7 +8,7 @@ export function uiIntroNavigation(context, reveal) {
     var dispatch = d3.dispatch('done'),
         timeouts = [],
         hallId = 'n2061',
-        springSt = [-85.63585099140167, 41.942506848938926];
+        springStreet = [-85.63585099140167, 41.942506848938926];
 
 
     var chapter = {
@@ -175,7 +175,7 @@ export function uiIntroNavigation(context, reveal) {
 
 
     function selectedStreet() {
-        context.map().centerEase(springSt);
+        context.map().centerEase(springStreet);
 
         timeout(function() {
             reveal('.entity-editor-pane',