Merge pull request #182 from Project-OSRM/exit-roundabout

update default instruction for exit roundabout
Project-OSRM · Oct 24, 2017 · 9fea311 · 9fea311
2 parents d2d0485 + f0664e9
commit 9fea311
Show file tree

Hide file tree

Showing 43 changed files with 48 additions and 59 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.10.3 2017-10-24
+
+- Change the default exit roundabout instruction to be `exit the traffic circle` [#182](https://github.com/Project-OSRM/osrm-text-instructions/pull/182)
+
 ## 0.10.2 2017-10-24
 
 - Change the default exit rotary instruction to be `exit the traffic circle` [#181](https://github.com/Project-OSRM/osrm-text-instructions/pull/181)

diff --git a/languages/translations/en.json b/languages/translations/en.json
@@ -409,24 +409,9 @@
         },
         "exit roundabout": {
             "default": {
-                "default": "Make a {modifier}",
-                "name": "Make a {modifier} onto {way_name}",
-                "destination": "Make a {modifier} towards {destination}"
-            },
-            "left": {
-                "default": "Turn left",
-                "name": "Turn left onto {way_name}",
-                "destination": "Turn left towards {destination}"
-            },
-            "right": {
-                "default": "Turn right",
-                "name": "Turn right onto {way_name}",
-                "destination": "Turn right towards {destination}"
-            },
-            "straight": {
-                "default": "Go straight",
-                "name": "Go straight onto {way_name}",
-                "destination": "Go straight towards {destination}"
+                "default": "Exit the traffic circle",
+                "name": "Exit the traffic circle onto {way_name}",
+                "destination": "Exit the traffic circle towards {destination}"
             }
         },
         "exit rotary": {

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "OSRM Text Instructions",
   "url": "https://github.com/Project-OSRM/osrm-text-instructions.js",
   "homepage": "http://project-osrm.org",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "main": "./index.js",
   "license": "BSD-2-Clause",
   "bugs": {

diff --git a/test/fixtures/v5/exit_roundabout/left_default.json b/test/fixtures/v5/exit_roundabout/left_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Links abbiegen",
-        "en": "Turn left",
+        "en": "Exit the traffic circle",
         "eo": "Turniĝu maldekstren",
         "es": "Gire a la izquierda",
         "es-ES": "Gire a la izquierda",

diff --git a/test/fixtures/v5/exit_roundabout/left_destination.json b/test/fixtures/v5/exit_roundabout/left_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Links abbiegen Richtung Destination 1",
-        "en": "Turn left towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Turniĝu maldekstren direkte al Destination 1",
         "es": "Gire a la izquierda hacia Destination 1",
         "es-ES": "Gire a la izquierda hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/left_exit.json b/test/fixtures/v5/exit_roundabout/left_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Links abbiegen auf Way Name",
-        "en": "Turn left onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Turniĝu maldekstren al Way Name",
         "es": "Gire a la izquierda en Way Name",
         "es-ES": "Gire a la izquierda en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/left_exit_destination.json b/test/fixtures/v5/exit_roundabout/left_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Links abbiegen Richtung Destination 1",
-        "en": "Turn left towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Turniĝu maldekstren direkte al Destination 1",
         "es": "Gire a la izquierda hacia Destination 1",
         "es-ES": "Gire a la izquierda hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/left_name.json b/test/fixtures/v5/exit_roundabout/left_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Links abbiegen auf Way Name",
-        "en": "Turn left onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Turniĝu maldekstren al Way Name",
         "es": "Gire a la izquierda en Way Name",
         "es-ES": "Gire a la izquierda en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/right_default.json b/test/fixtures/v5/exit_roundabout/right_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Rechts abbiegen",
-        "en": "Turn right",
+        "en": "Exit the traffic circle",
         "eo": "Turniĝu dekstren",
         "es": "Gire a la derecha",
         "es-ES": "Gire a la derecha",

diff --git a/test/fixtures/v5/exit_roundabout/right_destination.json b/test/fixtures/v5/exit_roundabout/right_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Rechts abbiegen Richtung Destination 1",
-        "en": "Turn right towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Turniĝu dekstren direkte al Destination 1",
         "es": "Gire a la derecha hacia Destination 1",
         "es-ES": "Gire a la derecha hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/right_exit.json b/test/fixtures/v5/exit_roundabout/right_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Rechts abbiegen auf Way Name",
-        "en": "Turn right onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Turniĝu dekstren al Way Name",
         "es": "Gire a la derecha en Way Name",
         "es-ES": "Gire a la derecha en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/right_exit_destination.json b/test/fixtures/v5/exit_roundabout/right_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Rechts abbiegen Richtung Destination 1",
-        "en": "Turn right towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Turniĝu dekstren direkte al Destination 1",
         "es": "Gire a la derecha hacia Destination 1",
         "es-ES": "Gire a la derecha hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/right_name.json b/test/fixtures/v5/exit_roundabout/right_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Rechts abbiegen auf Way Name",
-        "en": "Turn right onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Turniĝu dekstren al Way Name",
         "es": "Gire a la derecha en Way Name",
         "es-ES": "Gire a la derecha en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/sharp_left_default.json b/test/fixtures/v5/exit_roundabout/sharp_left_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Scharf links abbiegen",
-        "en": "Make a sharp left",
+        "en": "Exit the traffic circle",
         "eo": "Veturu maldekstregen",
         "es": "Siga cerrada a la izquierda",
         "es-ES": "Siga cerrada a la izquierda",

diff --git a/test/fixtures/v5/exit_roundabout/sharp_left_destination.json b/test/fixtures/v5/exit_roundabout/sharp_left_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Scharf links abbiegen Richtung Destination 1",
-        "en": "Make a sharp left towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu maldekstregen direkte al Destination 1",
         "es": "Siga cerrada a la izquierda hacia Destination 1",
         "es-ES": "Siga cerrada a la izquierda hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/sharp_left_exit.json b/test/fixtures/v5/exit_roundabout/sharp_left_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Scharf links abbiegen auf Way Name",
-        "en": "Make a sharp left onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu maldekstregen al Way Name",
         "es": "Siga cerrada a la izquierda en Way Name",
         "es-ES": "Siga cerrada a la izquierda en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/sharp_left_exit_destination.json b/test/fixtures/v5/exit_roundabout/sharp_left_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Scharf links abbiegen Richtung Destination 1",
-        "en": "Make a sharp left towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu maldekstregen direkte al Destination 1",
         "es": "Siga cerrada a la izquierda hacia Destination 1",
         "es-ES": "Siga cerrada a la izquierda hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/sharp_left_name.json b/test/fixtures/v5/exit_roundabout/sharp_left_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Scharf links abbiegen auf Way Name",
-        "en": "Make a sharp left onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu maldekstregen al Way Name",
         "es": "Siga cerrada a la izquierda en Way Name",
         "es-ES": "Siga cerrada a la izquierda en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/sharp_right_default.json b/test/fixtures/v5/exit_roundabout/sharp_right_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Scharf rechts abbiegen",
-        "en": "Make a sharp right",
+        "en": "Exit the traffic circle",
         "eo": "Veturu dekstregen",
         "es": "Siga cerrada a la derecha",
         "es-ES": "Siga cerrada a la derecha",

diff --git a/test/fixtures/v5/exit_roundabout/sharp_right_destination.json b/test/fixtures/v5/exit_roundabout/sharp_right_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Scharf rechts abbiegen Richtung Destination 1",
-        "en": "Make a sharp right towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu dekstregen direkte al Destination 1",
         "es": "Siga cerrada a la derecha hacia Destination 1",
         "es-ES": "Siga cerrada a la derecha hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/sharp_right_exit.json b/test/fixtures/v5/exit_roundabout/sharp_right_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Scharf rechts abbiegen auf Way Name",
-        "en": "Make a sharp right onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu dekstregen al Way Name",
         "es": "Siga cerrada a la derecha en Way Name",
         "es-ES": "Siga cerrada a la derecha en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/sharp_right_exit_destination.json b/test/fixtures/v5/exit_roundabout/sharp_right_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Scharf rechts abbiegen Richtung Destination 1",
-        "en": "Make a sharp right towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu dekstregen direkte al Destination 1",
         "es": "Siga cerrada a la derecha hacia Destination 1",
         "es-ES": "Siga cerrada a la derecha hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/sharp_right_name.json b/test/fixtures/v5/exit_roundabout/sharp_right_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Scharf rechts abbiegen auf Way Name",
-        "en": "Make a sharp right onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu dekstregen al Way Name",
         "es": "Siga cerrada a la derecha en Way Name",
         "es-ES": "Siga cerrada a la derecha en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/slight_left_default.json b/test/fixtures/v5/exit_roundabout/slight_left_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Leicht links abbiegen",
-        "en": "Make a slight left",
+        "en": "Exit the traffic circle",
         "eo": "Veturu maldekstreten",
         "es": "Siga ligeramente a la izquierda",
         "es-ES": "Siga ligeramente a la izquierda",

diff --git a/test/fixtures/v5/exit_roundabout/slight_left_destination.json b/test/fixtures/v5/exit_roundabout/slight_left_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Leicht links abbiegen Richtung Destination 1",
-        "en": "Make a slight left towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu maldekstreten direkte al Destination 1",
         "es": "Siga ligeramente a la izquierda hacia Destination 1",
         "es-ES": "Siga ligeramente a la izquierda hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/slight_left_exit.json b/test/fixtures/v5/exit_roundabout/slight_left_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Leicht links abbiegen auf Way Name",
-        "en": "Make a slight left onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu maldekstreten al Way Name",
         "es": "Siga ligeramente a la izquierda en Way Name",
         "es-ES": "Siga ligeramente a la izquierda en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/slight_left_exit_destination.json b/test/fixtures/v5/exit_roundabout/slight_left_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Leicht links abbiegen Richtung Destination 1",
-        "en": "Make a slight left towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu maldekstreten direkte al Destination 1",
         "es": "Siga ligeramente a la izquierda hacia Destination 1",
         "es-ES": "Siga ligeramente a la izquierda hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/slight_left_name.json b/test/fixtures/v5/exit_roundabout/slight_left_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Leicht links abbiegen auf Way Name",
-        "en": "Make a slight left onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu maldekstreten al Way Name",
         "es": "Siga ligeramente a la izquierda en Way Name",
         "es-ES": "Siga ligeramente a la izquierda en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/slight_right_default.json b/test/fixtures/v5/exit_roundabout/slight_right_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Leicht rechts abbiegen",
-        "en": "Make a slight right",
+        "en": "Exit the traffic circle",
         "eo": "Veturu dekstreten",
         "es": "Siga ligeramente a la derecha",
         "es-ES": "Siga ligeramente a la derecha",

diff --git a/test/fixtures/v5/exit_roundabout/slight_right_destination.json b/test/fixtures/v5/exit_roundabout/slight_right_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Leicht rechts abbiegen Richtung Destination 1",
-        "en": "Make a slight right towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu dekstreten direkte al Destination 1",
         "es": "Siga ligeramente a la derecha hacia Destination 1",
         "es-ES": "Siga ligeramente a la derecha hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/slight_right_exit.json b/test/fixtures/v5/exit_roundabout/slight_right_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Leicht rechts abbiegen auf Way Name",
-        "en": "Make a slight right onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu dekstreten al Way Name",
         "es": "Siga ligeramente a la derecha en Way Name",
         "es-ES": "Siga ligeramente a la derecha en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/slight_right_exit_destination.json b/test/fixtures/v5/exit_roundabout/slight_right_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Leicht rechts abbiegen Richtung Destination 1",
-        "en": "Make a slight right towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu dekstreten direkte al Destination 1",
         "es": "Siga ligeramente a la derecha hacia Destination 1",
         "es-ES": "Siga ligeramente a la derecha hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/slight_right_name.json b/test/fixtures/v5/exit_roundabout/slight_right_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Leicht rechts abbiegen auf Way Name",
-        "en": "Make a slight right onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu dekstreten al Way Name",
         "es": "Siga ligeramente a la derecha en Way Name",
         "es-ES": "Siga ligeramente a la derecha en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/straight_default.json b/test/fixtures/v5/exit_roundabout/straight_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Geradeaus weiterfahren",
-        "en": "Go straight",
+        "en": "Exit the traffic circle",
         "eo": "Veturu rekten",
         "es": "Ve recto",
         "es-ES": "Ve recto",

diff --git a/test/fixtures/v5/exit_roundabout/straight_destination.json b/test/fixtures/v5/exit_roundabout/straight_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Geradeaus weiterfahren Richtung Destination 1",
-        "en": "Go straight towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu rekten direkte al Destination 1",
         "es": "Ve recto hacia Destination 1",
         "es-ES": "Ve recto hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/straight_exit.json b/test/fixtures/v5/exit_roundabout/straight_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Geradeaus weiterfahren auf Way Name",
-        "en": "Go straight onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu rekten al Way Name",
         "es": "Ve recto en Way Name",
         "es-ES": "Ve recto en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/straight_exit_destination.json b/test/fixtures/v5/exit_roundabout/straight_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Geradeaus weiterfahren Richtung Destination 1",
-        "en": "Go straight towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu rekten direkte al Destination 1",
         "es": "Ve recto hacia Destination 1",
         "es-ES": "Ve recto hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/straight_name.json b/test/fixtures/v5/exit_roundabout/straight_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Geradeaus weiterfahren auf Way Name",
-        "en": "Go straight onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu rekten al Way Name",
         "es": "Ve recto en Way Name",
         "es-ES": "Ve recto en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/uturn_default.json b/test/fixtures/v5/exit_roundabout/uturn_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "180°-Wendung abbiegen",
-        "en": "Make a U-turn",
+        "en": "Exit the traffic circle",
         "eo": "Veturu turniĝu malantaŭen",
         "es": "Siga cambio de sentido",
         "es-ES": "Siga cambio de sentido",

diff --git a/test/fixtures/v5/exit_roundabout/uturn_destination.json b/test/fixtures/v5/exit_roundabout/uturn_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "180°-Wendung abbiegen Richtung Destination 1",
-        "en": "Make a U-turn towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu turniĝu malantaŭen direkte al Destination 1",
         "es": "Siga cambio de sentido hacia Destination 1",
         "es-ES": "Siga cambio de sentido hacia Destination 1",

diff --git a/test/fixtures/v5/exit_roundabout/uturn_exit.json b/test/fixtures/v5/exit_roundabout/uturn_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "180°-Wendung abbiegen auf Way Name",
-        "en": "Make a U-turn onto Way Name",
+        "en": "Exit the traffic circle onto Way Name",
         "eo": "Veturu turniĝu malantaŭen al Way Name",
         "es": "Siga cambio de sentido en Way Name",
         "es-ES": "Siga cambio de sentido en Way Name",

diff --git a/test/fixtures/v5/exit_roundabout/uturn_exit_destination.json b/test/fixtures/v5/exit_roundabout/uturn_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "180°-Wendung abbiegen Richtung Destination 1",
-        "en": "Make a U-turn towards Destination 1",
+        "en": "Exit the traffic circle towards Destination 1",
         "eo": "Veturu turniĝu malantaŭen direkte al Destination 1",
         "es": "Siga cambio de sentido hacia Destination 1",
         "es-ES": "Siga cambio de sentido hacia Destination 1",