Merge pull request #145 from Project-OSRM/fix-41

Continue maneuvers are maneuvers that keep you on the same road
Project-OSRM · Sep 7, 2017 · 529556b · 529556b
2 parents 5511209 + 83fedb0
commit 529556b
Show file tree

Hide file tree

Showing 50 changed files with 74 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file. For change log formatting, see http://keepachangelog.com/
 
+# 0.6.1
+
+- Updates `continue` maneuvers in en to read as turns when the road you are staying on turns at the intersection. [#145](https://github.com/Project-OSRM/osrm-text-instructions/pull/145)
+
 # 0.6.0
 
 - Adds `phrase` types to the English localiztion. [#141](https://github.com/Project-OSRM/osrm-text-instructions/pull/141)

diff --git a/languages/translations/en.json b/languages/translations/en.json
@@ -83,28 +83,37 @@
         },
         "continue": {
             "default": {
-                "default": "Continue {modifier}",
-                "name": "Continue {modifier} to stay on {way_name}",
-                "destination": "Continue {modifier} towards {destination}",
-                "exit": "Continue {modifier} onto {way_name}",
-                "distance": "Continue for {distance}",
-                "namedistance": "Continue on {way_name} for {distance}"
+                "default": "Turn {modifier}",
+                "name": "Turn {modifier} to stay on {way_name}",
+                "destination": "Turn {modifier} towards {destination}",
+                "exit": "Turn {modifier} onto {way_name}"
             },
             "straight": {
                 "default": "Continue straight",
                 "name": "Continue straight to stay on {way_name}",
                 "destination": "Continue towards {destination}",
-                "distance": "Continue straight for {distance}"
+                "distance": "Continue straight for {distance}",
+                "namedistance": "Continue on {way_name} for {distance}"
+            },
+            "sharp left": {
+                "default": "Make a sharp left",
+                "name": "Make a sharp left to stay on {way_name}",
+                "destination": "Make a sharp left towards {destination}"
+            },
+            "sharp right": {
+                "default": "Make a sharp right",
+                "name": "Make a sharp right to stay on {way_name}",
+                "destination": "Make a sharp right towards {destination}"
             },
             "slight left": {
-                "default": "Continue slightly left",
-                "name": "Continue slightly left to stay on {way_name}",
-                "destination": "Continue slightly left towards {destination}"
+                "default": "Make a slight left",
+                "name": "Make a slight left to stay on {way_name}",
+                "destination": "Make a slight left towards {destination}"
             },
             "slight right": {
-                "default": "Continue slightly right",
-                "name": "Continue slightly right to stay on {way_name}",
-                "destination": "Continue slightly right towards {destination}"
+                "default": "Make a slight right",
+                "name": "Make a slight right to stay on {way_name}",
+                "destination": "Make a slight right towards {destination}"
             },
             "uturn": {
                 "default": "Make a U-turn",

diff --git a/test/fixtures/v5/continue/left_default.json b/test/fixtures/v5/continue/left_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Links weiterfahren",
-        "en": "Continue left",
+        "en": "Turn left",
         "es": "Continúe izquierda",
         "fr": "Continuer à gauche",
         "id": "Terus kiri",

diff --git a/test/fixtures/v5/continue/left_destination.json b/test/fixtures/v5/continue/left_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Links weiterfahren Richtung Destination 1",
-        "en": "Continue left towards Destination 1",
+        "en": "Turn left towards Destination 1",
         "es": "Continúe izquierda hacia Destination 1",
         "fr": "Continuer à gauche en direction de Destination 1",
         "id": "Teruskan kiri menuju Destination 1",

diff --git a/test/fixtures/v5/continue/left_exit.json b/test/fixtures/v5/continue/left_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Links weiterfahren auf Way Name",
-        "en": "Continue left onto Way Name",
+        "en": "Turn left onto Way Name",
         "es": "Continúe izquierda en Way Name",
         "fr": "Continuer à gauche sur Way Name",
         "id": "Terus kiri ke Way Name",

diff --git a/test/fixtures/v5/continue/left_exit_destination.json b/test/fixtures/v5/continue/left_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Links weiterfahren Richtung Destination 1",
-        "en": "Continue left towards Destination 1",
+        "en": "Turn left towards Destination 1",
         "es": "Continúe izquierda hacia Destination 1",
         "fr": "Continuer à gauche en direction de Destination 1",
         "id": "Teruskan kiri menuju Destination 1",

diff --git a/test/fixtures/v5/continue/left_name.json b/test/fixtures/v5/continue/left_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Links weiterfahren auf Way Name",
-        "en": "Continue left to stay on Way Name",
+        "en": "Turn left to stay on Way Name",
         "es": "Continúe izquierda en Way Name",
         "fr": "Continuer à gauche sur Way Name",
         "id": "Terus kiri ke Way Name",

diff --git a/test/fixtures/v5/continue/right_default.json b/test/fixtures/v5/continue/right_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Rechts weiterfahren",
-        "en": "Continue right",
+        "en": "Turn right",
         "es": "Continúe derecha",
         "fr": "Continuer à droite",
         "id": "Terus kanan",

diff --git a/test/fixtures/v5/continue/right_destination.json b/test/fixtures/v5/continue/right_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Rechts weiterfahren Richtung Destination 1",
-        "en": "Continue right towards Destination 1",
+        "en": "Turn right towards Destination 1",
         "es": "Continúe derecha hacia Destination 1",
         "fr": "Continuer à droite en direction de Destination 1",
         "id": "Teruskan kanan menuju Destination 1",

diff --git a/test/fixtures/v5/continue/right_exit.json b/test/fixtures/v5/continue/right_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Rechts weiterfahren auf Way Name",
-        "en": "Continue right onto Way Name",
+        "en": "Turn right onto Way Name",
         "es": "Continúe derecha en Way Name",
         "fr": "Continuer à droite sur Way Name",
         "id": "Terus kanan ke Way Name",

diff --git a/test/fixtures/v5/continue/right_exit_destination.json b/test/fixtures/v5/continue/right_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Rechts weiterfahren Richtung Destination 1",
-        "en": "Continue right towards Destination 1",
+        "en": "Turn right towards Destination 1",
         "es": "Continúe derecha hacia Destination 1",
         "fr": "Continuer à droite en direction de Destination 1",
         "id": "Teruskan kanan menuju Destination 1",

diff --git a/test/fixtures/v5/continue/right_name.json b/test/fixtures/v5/continue/right_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Rechts weiterfahren auf Way Name",
-        "en": "Continue right to stay on Way Name",
+        "en": "Turn right to stay on Way Name",
         "es": "Continúe derecha en Way Name",
         "fr": "Continuer à droite sur Way Name",
         "id": "Terus kanan ke Way Name",

diff --git a/test/fixtures/v5/continue/sharp_left_default.json b/test/fixtures/v5/continue/sharp_left_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Scharf links weiterfahren",
-        "en": "Continue sharp left",
+        "en": "Make a sharp left",
         "es": "Continúe cerrada a la izquierda",
         "fr": "Continuer franchement à gauche",
         "id": "Terus tajam kiri",

diff --git a/test/fixtures/v5/continue/sharp_left_destination.json b/test/fixtures/v5/continue/sharp_left_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Scharf links weiterfahren Richtung Destination 1",
-        "en": "Continue sharp left towards Destination 1",
+        "en": "Make a sharp left towards Destination 1",
         "es": "Continúe cerrada a la izquierda hacia Destination 1",
         "fr": "Continuer franchement à gauche en direction de Destination 1",
         "id": "Teruskan tajam kiri menuju Destination 1",

diff --git a/test/fixtures/v5/continue/sharp_left_exit.json b/test/fixtures/v5/continue/sharp_left_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Scharf links weiterfahren auf Way Name",
-        "en": "Continue sharp left onto Way Name",
+        "en": "Make a sharp left to stay on Way Name",
         "es": "Continúe cerrada a la izquierda en Way Name",
         "fr": "Continuer franchement à gauche sur Way Name",
         "id": "Terus tajam kiri ke Way Name",

diff --git a/test/fixtures/v5/continue/sharp_left_exit_destination.json b/test/fixtures/v5/continue/sharp_left_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Scharf links weiterfahren Richtung Destination 1",
-        "en": "Continue sharp left towards Destination 1",
+        "en": "Make a sharp left towards Destination 1",
         "es": "Continúe cerrada a la izquierda hacia Destination 1",
         "fr": "Continuer franchement à gauche en direction de Destination 1",
         "id": "Teruskan tajam kiri menuju Destination 1",

diff --git a/test/fixtures/v5/continue/sharp_left_name.json b/test/fixtures/v5/continue/sharp_left_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Scharf links weiterfahren auf Way Name",
-        "en": "Continue sharp left to stay on Way Name",
+        "en": "Make a sharp left to stay on Way Name",
         "es": "Continúe cerrada a la izquierda en Way Name",
         "fr": "Continuer franchement à gauche sur Way Name",
         "id": "Terus tajam kiri ke Way Name",

diff --git a/test/fixtures/v5/continue/sharp_right_default.json b/test/fixtures/v5/continue/sharp_right_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Scharf rechts weiterfahren",
-        "en": "Continue sharp right",
+        "en": "Make a sharp right",
         "es": "Continúe cerrada a la derecha",
         "fr": "Continuer franchement à droite",
         "id": "Terus tajam kanan",

diff --git a/test/fixtures/v5/continue/sharp_right_destination.json b/test/fixtures/v5/continue/sharp_right_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Scharf rechts weiterfahren Richtung Destination 1",
-        "en": "Continue sharp right towards Destination 1",
+        "en": "Make a sharp right towards Destination 1",
         "es": "Continúe cerrada a la derecha hacia Destination 1",
         "fr": "Continuer franchement à droite en direction de Destination 1",
         "id": "Teruskan tajam kanan menuju Destination 1",

diff --git a/test/fixtures/v5/continue/sharp_right_exit.json b/test/fixtures/v5/continue/sharp_right_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Scharf rechts weiterfahren auf Way Name",
-        "en": "Continue sharp right onto Way Name",
+        "en": "Make a sharp right to stay on Way Name",
         "es": "Continúe cerrada a la derecha en Way Name",
         "fr": "Continuer franchement à droite sur Way Name",
         "id": "Terus tajam kanan ke Way Name",

diff --git a/test/fixtures/v5/continue/sharp_right_exit_destination.json b/test/fixtures/v5/continue/sharp_right_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Scharf rechts weiterfahren Richtung Destination 1",
-        "en": "Continue sharp right towards Destination 1",
+        "en": "Make a sharp right towards Destination 1",
         "es": "Continúe cerrada a la derecha hacia Destination 1",
         "fr": "Continuer franchement à droite en direction de Destination 1",
         "id": "Teruskan tajam kanan menuju Destination 1",

diff --git a/test/fixtures/v5/continue/sharp_right_name.json b/test/fixtures/v5/continue/sharp_right_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Scharf rechts weiterfahren auf Way Name",
-        "en": "Continue sharp right to stay on Way Name",
+        "en": "Make a sharp right to stay on Way Name",
         "es": "Continúe cerrada a la derecha en Way Name",
         "fr": "Continuer franchement à droite sur Way Name",
         "id": "Terus tajam kanan ke Way Name",

diff --git a/test/fixtures/v5/continue/slight_left_default.json b/test/fixtures/v5/continue/slight_left_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Leicht links weiter",
-        "en": "Continue slightly left",
+        "en": "Make a slight left",
         "es": "Continúe ligeramente a la izquierda",
         "fr": "Continuer légèrement à gauche",
         "id": "Tetap agak di kiri",

diff --git a/test/fixtures/v5/continue/slight_left_destination.json b/test/fixtures/v5/continue/slight_left_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Leicht links weiter Richtung Destination 1",
-        "en": "Continue slightly left towards Destination 1",
+        "en": "Make a slight left towards Destination 1",
         "es": "Continúe ligeramente a la izquierda hacia Destination 1",
         "fr": "Continuer légèrement à gauche en direction de Destination 1",
         "id": "Tetap agak di kiri menuju Destination 1",

diff --git a/test/fixtures/v5/continue/slight_left_exit.json b/test/fixtures/v5/continue/slight_left_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Leicht links weiter auf Way Name",
-        "en": "Continue slightly left to stay on Way Name",
+        "en": "Make a slight left to stay on Way Name",
         "es": "Continúe ligeramente a la izquierda en Way Name",
         "fr": "Continuer légèrement à gauche sur Way Name",
         "id": "Tetap agak di kiri ke Way Name",

diff --git a/test/fixtures/v5/continue/slight_left_exit_destination.json b/test/fixtures/v5/continue/slight_left_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Leicht links weiter Richtung Destination 1",
-        "en": "Continue slightly left towards Destination 1",
+        "en": "Make a slight left towards Destination 1",
         "es": "Continúe ligeramente a la izquierda hacia Destination 1",
         "fr": "Continuer légèrement à gauche en direction de Destination 1",
         "id": "Tetap agak di kiri menuju Destination 1",

diff --git a/test/fixtures/v5/continue/slight_left_name.json b/test/fixtures/v5/continue/slight_left_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Leicht links weiter auf Way Name",
-        "en": "Continue slightly left to stay on Way Name",
+        "en": "Make a slight left to stay on Way Name",
         "es": "Continúe ligeramente a la izquierda en Way Name",
         "fr": "Continuer légèrement à gauche sur Way Name",
         "id": "Tetap agak di kiri ke Way Name",

diff --git a/test/fixtures/v5/continue/slight_right_default.json b/test/fixtures/v5/continue/slight_right_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Leicht rechts weiter",
-        "en": "Continue slightly right",
+        "en": "Make a slight right",
         "es": "Continúe ligeramente a la derecha",
         "fr": "Continuer légèrement à droite",
         "id": "Tetap agak di kanan",

diff --git a/test/fixtures/v5/continue/slight_right_destination.json b/test/fixtures/v5/continue/slight_right_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Leicht rechts weiter Richtung Destination 1",
-        "en": "Continue slightly right towards Destination 1",
+        "en": "Make a slight right towards Destination 1",
         "es": "Continúe ligeramente a la derecha hacia Destination 1",
         "fr": "Continuer légèrement à droite en direction de Destination 1",
         "id": "Tetap agak di kanan menuju Destination 1",

diff --git a/test/fixtures/v5/continue/slight_right_exit.json b/test/fixtures/v5/continue/slight_right_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Leicht rechts weiter auf Way Name",
-        "en": "Continue slightly right to stay on Way Name",
+        "en": "Make a slight right to stay on Way Name",
         "es": "Continúe ligeramente a la derecha en Way Name",
         "fr": "Continuer légèrement à droite sur Way Name",
         "id": "Tetap agak di kanan ke Way Name",

diff --git a/test/fixtures/v5/continue/slight_right_exit_destination.json b/test/fixtures/v5/continue/slight_right_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Leicht rechts weiter Richtung Destination 1",
-        "en": "Continue slightly right towards Destination 1",
+        "en": "Make a slight right towards Destination 1",
         "es": "Continúe ligeramente a la derecha hacia Destination 1",
         "fr": "Continuer légèrement à droite en direction de Destination 1",
         "id": "Tetap agak di kanan menuju Destination 1",

diff --git a/test/fixtures/v5/continue/slight_right_name.json b/test/fixtures/v5/continue/slight_right_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Leicht rechts weiter auf Way Name",
-        "en": "Continue slightly right to stay on Way Name",
+        "en": "Make a slight right to stay on Way Name",
         "es": "Continúe ligeramente a la derecha en Way Name",
         "fr": "Continuer légèrement à droite sur Way Name",
         "id": "Tetap agak di kanan ke Way Name",

diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_left.json b/test/fixtures/v5/other/motorway_ref_has_no_number_left.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Links weiterfahren auf Cool highway",
-        "en": "Continue left to stay on Cool highway",
+        "en": "Turn left to stay on Cool highway",
         "es": "Continúe izquierda en Cool highway",
         "fr": "Continuer à gauche sur Cool highway",
         "id": "Terus kiri ke Cool highway",

diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_right.json b/test/fixtures/v5/other/motorway_ref_has_no_number_right.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Rechts weiterfahren auf Cool highway",
-        "en": "Continue right to stay on Cool highway",
+        "en": "Turn right to stay on Cool highway",
         "es": "Continúe derecha en Cool highway",
         "fr": "Continuer à droite sur Cool highway",
         "id": "Terus kanan ke Cool highway",

diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_sharp left.json b/test/fixtures/v5/other/motorway_ref_has_no_number_sharp left.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Scharf links weiterfahren auf Cool highway",
-        "en": "Continue sharp left to stay on Cool highway",
+        "en": "Make a sharp left to stay on Cool highway",
         "es": "Continúe cerrada a la izquierda en Cool highway",
         "fr": "Continuer franchement à gauche sur Cool highway",
         "id": "Terus tajam kiri ke Cool highway",

diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_sharp right.json b/test/fixtures/v5/other/motorway_ref_has_no_number_sharp right.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Scharf rechts weiterfahren auf Cool highway",
-        "en": "Continue sharp right to stay on Cool highway",
+        "en": "Make a sharp right to stay on Cool highway",
         "es": "Continúe cerrada a la derecha en Cool highway",
         "fr": "Continuer franchement à droite sur Cool highway",
         "id": "Terus tajam kanan ke Cool highway",

diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_slight left.json b/test/fixtures/v5/other/motorway_ref_has_no_number_slight left.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Leicht links weiter auf Cool highway",
-        "en": "Continue slightly left to stay on Cool highway",
+        "en": "Make a slight left to stay on Cool highway",
         "es": "Continúe ligeramente a la izquierda en Cool highway",
         "fr": "Continuer légèrement à gauche sur Cool highway",
         "id": "Tetap agak di kiri ke Cool highway",

diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_slight right.json b/test/fixtures/v5/other/motorway_ref_has_no_number_slight right.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Leicht rechts weiter auf Cool highway",
-        "en": "Continue slightly right to stay on Cool highway",
+        "en": "Make a slight right to stay on Cool highway",
         "es": "Continúe ligeramente a la derecha en Cool highway",
         "fr": "Continuer légèrement à droite sur Cool highway",
         "id": "Tetap agak di kanan ke Cool highway",

diff --git a/test/fixtures/v5/other/motorway_ref_has_number_left.json b/test/fixtures/v5/other/motorway_ref_has_number_left.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Links weiterfahren auf Ref1",
-        "en": "Continue left to stay on Ref1",
+        "en": "Turn left to stay on Ref1",
         "es": "Continúe izquierda en Ref1",
         "fr": "Continuer à gauche sur Ref1",
         "id": "Terus kiri ke Ref1",