From afc28fc3dc9a39565465c35784140b3509649acc Mon Sep 17 00:00:00 2001
From: tyr <tyr.asd@gmail.com>
Date: Sat, 24 Aug 2013 22:42:04 +0200
Subject: [PATCH] walkthrough: handle wrongly selected road type Currently,
 when one selects a road type other than residential, the walkthrough gets
 stuck. This adds an additional step for this case and tells the user to redo
 the preset selection.

---
 dist/locales/en.json   |  5 +++--
 js/id/ui/intro/line.js | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dist/locales/en.json b/dist/locales/en.json
index 632769eab..f9e276496 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -356,7 +356,8 @@
             "road": "**Select Road from the list**",
             "residential": "There are different types of roads, the most common of which is Residential. **Choose the Residential road type**",
             "describe": "**Name the road and close the feature editor.**",
-            "restart": "The road needs to intersect Flower Street."
+            "restart": "The road needs to intersect Flower Street.",
+            "wrong_preset": "You didn't select the Residential road type. **Click here to choose again**"
         },
         "startediting": {
             "title": "Start Editing",
@@ -2040,4 +2041,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/js/id/ui/intro/line.js b/js/id/ui/intro/line.js
index 34b527959..868701af9 100644
--- a/js/id/ui/intro/line.js
+++ b/js/id/ui/intro/line.js
@@ -95,6 +95,10 @@ iD.ui.intro.line = function(context, reveal) {
             context.on('enter.intro', null);
             d3.select('#curtain').style('pointer-events', 'all');
 
+            presetCategory();
+        }
+
+        function presetCategory() {
             timeout(function() {
                 d3.select('#curtain').style('pointer-events', 'none');
                 var road = d3.select('.preset-category-road .preset-list-button');
@@ -107,11 +111,22 @@ iD.ui.intro.line = function(context, reveal) {
             timeout(function() {
                 var grid = d3.select('.subgrid');
                 reveal(grid.node(), t('intro.lines.residential'));
+                grid.selectAll(':not(.preset-highway-residential) .preset-list-button')
+                    .one('click.intro', retryPreset);
                 grid.selectAll('.preset-highway-residential .preset-list-button')
                     .one('click.intro', roadDetails);
             }, 500);
         }
 
+        // selected wrong road type
+        function retryPreset(mode) {
+            timeout(function() {
+                var preset = d3.select('.entity-editor-pane .preset-list-button');
+                reveal(preset.node(), t('intro.lines.wrong_preset'));
+                preset.one('click.intro', presetCategory);
+            }, 500);
+        }
+
         function roadDetails() {
             reveal('.pane', t('intro.lines.describe'));
             context.on('exit.intro', event.done);