Skip to content

Commit 529556b

Browse files
mcwhittemoremcwhittemore
authored
Merge pull request #145 from Project-OSRM/fix-41
Continue maneuvers are maneuvers that keep you on the same road
2 parents 5511209 + 83fedb0 commit 529556b

File tree

50 files changed

+74
-61
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+74
-61
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Change Log
22
All notable changes to this project will be documented in this file. For change log formatting, see http://keepachangelog.com/
33

4+
# 0.6.1
5+
6+
- 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)
7+
48
# 0.6.0
59

610
- Adds `phrase` types to the English localiztion. [#141](https://github.com/Project-OSRM/osrm-text-instructions/pull/141)

‎languages/translations/en.json

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,28 +83,37 @@
8383
},
8484
"continue": {
8585
"default": {
86-
"default": "Continue {modifier}",
87-
"name": "Continue {modifier} to stay on {way_name}",
88-
"destination": "Continue {modifier} towards {destination}",
89-
"exit": "Continue {modifier} onto {way_name}",
90-
"distance": "Continue for {distance}",
91-
"namedistance": "Continue on {way_name} for {distance}"
86+
"default": "Turn {modifier}",
87+
"name": "Turn {modifier} to stay on {way_name}",
88+
"destination": "Turn {modifier} towards {destination}",
89+
"exit": "Turn {modifier} onto {way_name}"
9290
},
9391
"straight": {
9492
"default": "Continue straight",
9593
"name": "Continue straight to stay on {way_name}",
9694
"destination": "Continue towards {destination}",
97-
"distance": "Continue straight for {distance}"
95+
"distance": "Continue straight for {distance}",
96+
"namedistance": "Continue on {way_name} for {distance}"
97+
},
98+
"sharp left": {
99+
"default": "Make a sharp left",
100+
"name": "Make a sharp left to stay on {way_name}",
101+
"destination": "Make a sharp left towards {destination}"
102+
},
103+
"sharp right": {
104+
"default": "Make a sharp right",
105+
"name": "Make a sharp right to stay on {way_name}",
106+
"destination": "Make a sharp right towards {destination}"
98107
},
99108
"slight left": {
100-
"default": "Continue slightly left",
101-
"name": "Continue slightly left to stay on {way_name}",
102-
"destination": "Continue slightly left towards {destination}"
109+
"default": "Make a slight left",
110+
"name": "Make a slight left to stay on {way_name}",
111+
"destination": "Make a slight left towards {destination}"
103112
},
104113
"slight right": {
105-
"default": "Continue slightly right",
106-
"name": "Continue slightly right to stay on {way_name}",
107-
"destination": "Continue slightly right towards {destination}"
114+
"default": "Make a slight right",
115+
"name": "Make a slight right to stay on {way_name}",
116+
"destination": "Make a slight right towards {destination}"
108117
},
109118
"uturn": {
110119
"default": "Make a U-turn",

‎test/fixtures/v5/continue/left_default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Links weiterfahren",
11-
"en": "Continue left",
11+
"en": "Turn left",
1212
"es": "Continúe izquierda",
1313
"fr": "Continuer à gauche",
1414
"id": "Terus kiri",

‎test/fixtures/v5/continue/left_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Links weiterfahren Richtung Destination 1",
12-
"en": "Continue left towards Destination 1",
12+
"en": "Turn left towards Destination 1",
1313
"es": "Continúe izquierda hacia Destination 1",
1414
"fr": "Continuer à gauche en direction de Destination 1",
1515
"id": "Teruskan kiri menuju Destination 1",

‎test/fixtures/v5/continue/left_exit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Links weiterfahren auf Way Name",
12-
"en": "Continue left onto Way Name",
12+
"en": "Turn left onto Way Name",
1313
"es": "Continúe izquierda en Way Name",
1414
"fr": "Continuer à gauche sur Way Name",
1515
"id": "Terus kiri ke Way Name",

‎test/fixtures/v5/continue/left_exit_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"instructions": {
1212
"de": "Links weiterfahren Richtung Destination 1",
13-
"en": "Continue left towards Destination 1",
13+
"en": "Turn left towards Destination 1",
1414
"es": "Continúe izquierda hacia Destination 1",
1515
"fr": "Continuer à gauche en direction de Destination 1",
1616
"id": "Teruskan kiri menuju Destination 1",

‎test/fixtures/v5/continue/left_name.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Links weiterfahren auf Way Name",
11-
"en": "Continue left to stay on Way Name",
11+
"en": "Turn left to stay on Way Name",
1212
"es": "Continúe izquierda en Way Name",
1313
"fr": "Continuer à gauche sur Way Name",
1414
"id": "Terus kiri ke Way Name",

‎test/fixtures/v5/continue/right_default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Rechts weiterfahren",
11-
"en": "Continue right",
11+
"en": "Turn right",
1212
"es": "Continúe derecha",
1313
"fr": "Continuer à droite",
1414
"id": "Terus kanan",

‎test/fixtures/v5/continue/right_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Rechts weiterfahren Richtung Destination 1",
12-
"en": "Continue right towards Destination 1",
12+
"en": "Turn right towards Destination 1",
1313
"es": "Continúe derecha hacia Destination 1",
1414
"fr": "Continuer à droite en direction de Destination 1",
1515
"id": "Teruskan kanan menuju Destination 1",

‎test/fixtures/v5/continue/right_exit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Rechts weiterfahren auf Way Name",
12-
"en": "Continue right onto Way Name",
12+
"en": "Turn right onto Way Name",
1313
"es": "Continúe derecha en Way Name",
1414
"fr": "Continuer à droite sur Way Name",
1515
"id": "Terus kanan ke Way Name",

‎test/fixtures/v5/continue/right_exit_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"instructions": {
1212
"de": "Rechts weiterfahren Richtung Destination 1",
13-
"en": "Continue right towards Destination 1",
13+
"en": "Turn right towards Destination 1",
1414
"es": "Continúe derecha hacia Destination 1",
1515
"fr": "Continuer à droite en direction de Destination 1",
1616
"id": "Teruskan kanan menuju Destination 1",

‎test/fixtures/v5/continue/right_name.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Rechts weiterfahren auf Way Name",
11-
"en": "Continue right to stay on Way Name",
11+
"en": "Turn right to stay on Way Name",
1212
"es": "Continúe derecha en Way Name",
1313
"fr": "Continuer à droite sur Way Name",
1414
"id": "Terus kanan ke Way Name",

‎test/fixtures/v5/continue/sharp_left_default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Scharf links weiterfahren",
11-
"en": "Continue sharp left",
11+
"en": "Make a sharp left",
1212
"es": "Continúe cerrada a la izquierda",
1313
"fr": "Continuer franchement à gauche",
1414
"id": "Terus tajam kiri",

‎test/fixtures/v5/continue/sharp_left_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Scharf links weiterfahren Richtung Destination 1",
12-
"en": "Continue sharp left towards Destination 1",
12+
"en": "Make a sharp left towards Destination 1",
1313
"es": "Continúe cerrada a la izquierda hacia Destination 1",
1414
"fr": "Continuer franchement à gauche en direction de Destination 1",
1515
"id": "Teruskan tajam kiri menuju Destination 1",

‎test/fixtures/v5/continue/sharp_left_exit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Scharf links weiterfahren auf Way Name",
12-
"en": "Continue sharp left onto Way Name",
12+
"en": "Make a sharp left to stay on Way Name",
1313
"es": "Continúe cerrada a la izquierda en Way Name",
1414
"fr": "Continuer franchement à gauche sur Way Name",
1515
"id": "Terus tajam kiri ke Way Name",

‎test/fixtures/v5/continue/sharp_left_exit_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"instructions": {
1212
"de": "Scharf links weiterfahren Richtung Destination 1",
13-
"en": "Continue sharp left towards Destination 1",
13+
"en": "Make a sharp left towards Destination 1",
1414
"es": "Continúe cerrada a la izquierda hacia Destination 1",
1515
"fr": "Continuer franchement à gauche en direction de Destination 1",
1616
"id": "Teruskan tajam kiri menuju Destination 1",

‎test/fixtures/v5/continue/sharp_left_name.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Scharf links weiterfahren auf Way Name",
11-
"en": "Continue sharp left to stay on Way Name",
11+
"en": "Make a sharp left to stay on Way Name",
1212
"es": "Continúe cerrada a la izquierda en Way Name",
1313
"fr": "Continuer franchement à gauche sur Way Name",
1414
"id": "Terus tajam kiri ke Way Name",

‎test/fixtures/v5/continue/sharp_right_default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Scharf rechts weiterfahren",
11-
"en": "Continue sharp right",
11+
"en": "Make a sharp right",
1212
"es": "Continúe cerrada a la derecha",
1313
"fr": "Continuer franchement à droite",
1414
"id": "Terus tajam kanan",

‎test/fixtures/v5/continue/sharp_right_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Scharf rechts weiterfahren Richtung Destination 1",
12-
"en": "Continue sharp right towards Destination 1",
12+
"en": "Make a sharp right towards Destination 1",
1313
"es": "Continúe cerrada a la derecha hacia Destination 1",
1414
"fr": "Continuer franchement à droite en direction de Destination 1",
1515
"id": "Teruskan tajam kanan menuju Destination 1",

‎test/fixtures/v5/continue/sharp_right_exit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Scharf rechts weiterfahren auf Way Name",
12-
"en": "Continue sharp right onto Way Name",
12+
"en": "Make a sharp right to stay on Way Name",
1313
"es": "Continúe cerrada a la derecha en Way Name",
1414
"fr": "Continuer franchement à droite sur Way Name",
1515
"id": "Terus tajam kanan ke Way Name",

‎test/fixtures/v5/continue/sharp_right_exit_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"instructions": {
1212
"de": "Scharf rechts weiterfahren Richtung Destination 1",
13-
"en": "Continue sharp right towards Destination 1",
13+
"en": "Make a sharp right towards Destination 1",
1414
"es": "Continúe cerrada a la derecha hacia Destination 1",
1515
"fr": "Continuer franchement à droite en direction de Destination 1",
1616
"id": "Teruskan tajam kanan menuju Destination 1",

‎test/fixtures/v5/continue/sharp_right_name.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Scharf rechts weiterfahren auf Way Name",
11-
"en": "Continue sharp right to stay on Way Name",
11+
"en": "Make a sharp right to stay on Way Name",
1212
"es": "Continúe cerrada a la derecha en Way Name",
1313
"fr": "Continuer franchement à droite sur Way Name",
1414
"id": "Terus tajam kanan ke Way Name",

‎test/fixtures/v5/continue/slight_left_default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Leicht links weiter",
11-
"en": "Continue slightly left",
11+
"en": "Make a slight left",
1212
"es": "Continúe ligeramente a la izquierda",
1313
"fr": "Continuer légèrement à gauche",
1414
"id": "Tetap agak di kiri",

‎test/fixtures/v5/continue/slight_left_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Leicht links weiter Richtung Destination 1",
12-
"en": "Continue slightly left towards Destination 1",
12+
"en": "Make a slight left towards Destination 1",
1313
"es": "Continúe ligeramente a la izquierda hacia Destination 1",
1414
"fr": "Continuer légèrement à gauche en direction de Destination 1",
1515
"id": "Tetap agak di kiri menuju Destination 1",

‎test/fixtures/v5/continue/slight_left_exit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Leicht links weiter auf Way Name",
12-
"en": "Continue slightly left to stay on Way Name",
12+
"en": "Make a slight left to stay on Way Name",
1313
"es": "Continúe ligeramente a la izquierda en Way Name",
1414
"fr": "Continuer légèrement à gauche sur Way Name",
1515
"id": "Tetap agak di kiri ke Way Name",

‎test/fixtures/v5/continue/slight_left_exit_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"instructions": {
1212
"de": "Leicht links weiter Richtung Destination 1",
13-
"en": "Continue slightly left towards Destination 1",
13+
"en": "Make a slight left towards Destination 1",
1414
"es": "Continúe ligeramente a la izquierda hacia Destination 1",
1515
"fr": "Continuer légèrement à gauche en direction de Destination 1",
1616
"id": "Tetap agak di kiri menuju Destination 1",

‎test/fixtures/v5/continue/slight_left_name.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Leicht links weiter auf Way Name",
11-
"en": "Continue slightly left to stay on Way Name",
11+
"en": "Make a slight left to stay on Way Name",
1212
"es": "Continúe ligeramente a la izquierda en Way Name",
1313
"fr": "Continuer légèrement à gauche sur Way Name",
1414
"id": "Tetap agak di kiri ke Way Name",

‎test/fixtures/v5/continue/slight_right_default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Leicht rechts weiter",
11-
"en": "Continue slightly right",
11+
"en": "Make a slight right",
1212
"es": "Continúe ligeramente a la derecha",
1313
"fr": "Continuer légèrement à droite",
1414
"id": "Tetap agak di kanan",

‎test/fixtures/v5/continue/slight_right_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Leicht rechts weiter Richtung Destination 1",
12-
"en": "Continue slightly right towards Destination 1",
12+
"en": "Make a slight right towards Destination 1",
1313
"es": "Continúe ligeramente a la derecha hacia Destination 1",
1414
"fr": "Continuer légèrement à droite en direction de Destination 1",
1515
"id": "Tetap agak di kanan menuju Destination 1",

‎test/fixtures/v5/continue/slight_right_exit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Leicht rechts weiter auf Way Name",
12-
"en": "Continue slightly right to stay on Way Name",
12+
"en": "Make a slight right to stay on Way Name",
1313
"es": "Continúe ligeramente a la derecha en Way Name",
1414
"fr": "Continuer légèrement à droite sur Way Name",
1515
"id": "Tetap agak di kanan ke Way Name",

‎test/fixtures/v5/continue/slight_right_exit_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"instructions": {
1212
"de": "Leicht rechts weiter Richtung Destination 1",
13-
"en": "Continue slightly right towards Destination 1",
13+
"en": "Make a slight right towards Destination 1",
1414
"es": "Continúe ligeramente a la derecha hacia Destination 1",
1515
"fr": "Continuer légèrement à droite en direction de Destination 1",
1616
"id": "Tetap agak di kanan menuju Destination 1",

‎test/fixtures/v5/continue/slight_right_name.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Leicht rechts weiter auf Way Name",
11-
"en": "Continue slightly right to stay on Way Name",
11+
"en": "Make a slight right to stay on Way Name",
1212
"es": "Continúe ligeramente a la derecha en Way Name",
1313
"fr": "Continuer légèrement à droite sur Way Name",
1414
"id": "Tetap agak di kanan ke Way Name",

‎test/fixtures/v5/other/motorway_ref_has_no_number_left.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Links weiterfahren auf Cool highway",
12-
"en": "Continue left to stay on Cool highway",
12+
"en": "Turn left to stay on Cool highway",
1313
"es": "Continúe izquierda en Cool highway",
1414
"fr": "Continuer à gauche sur Cool highway",
1515
"id": "Terus kiri ke Cool highway",

‎test/fixtures/v5/other/motorway_ref_has_no_number_right.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Rechts weiterfahren auf Cool highway",
12-
"en": "Continue right to stay on Cool highway",
12+
"en": "Turn right to stay on Cool highway",
1313
"es": "Continúe derecha en Cool highway",
1414
"fr": "Continuer à droite sur Cool highway",
1515
"id": "Terus kanan ke Cool highway",

‎test/fixtures/v5/other/motorway_ref_has_no_number_sharp left.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Scharf links weiterfahren auf Cool highway",
12-
"en": "Continue sharp left to stay on Cool highway",
12+
"en": "Make a sharp left to stay on Cool highway",
1313
"es": "Continúe cerrada a la izquierda en Cool highway",
1414
"fr": "Continuer franchement à gauche sur Cool highway",
1515
"id": "Terus tajam kiri ke Cool highway",

‎test/fixtures/v5/other/motorway_ref_has_no_number_sharp right.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Scharf rechts weiterfahren auf Cool highway",
12-
"en": "Continue sharp right to stay on Cool highway",
12+
"en": "Make a sharp right to stay on Cool highway",
1313
"es": "Continúe cerrada a la derecha en Cool highway",
1414
"fr": "Continuer franchement à droite sur Cool highway",
1515
"id": "Terus tajam kanan ke Cool highway",

‎test/fixtures/v5/other/motorway_ref_has_no_number_slight left.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Leicht links weiter auf Cool highway",
12-
"en": "Continue slightly left to stay on Cool highway",
12+
"en": "Make a slight left to stay on Cool highway",
1313
"es": "Continúe ligeramente a la izquierda en Cool highway",
1414
"fr": "Continuer légèrement à gauche sur Cool highway",
1515
"id": "Tetap agak di kiri ke Cool highway",

‎test/fixtures/v5/other/motorway_ref_has_no_number_slight right.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Leicht rechts weiter auf Cool highway",
12-
"en": "Continue slightly right to stay on Cool highway",
12+
"en": "Make a slight right to stay on Cool highway",
1313
"es": "Continúe ligeramente a la derecha en Cool highway",
1414
"fr": "Continuer légèrement à droite sur Cool highway",
1515
"id": "Tetap agak di kanan ke Cool highway",

‎test/fixtures/v5/other/motorway_ref_has_number_left.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Links weiterfahren auf Ref1",
12-
"en": "Continue left to stay on Ref1",
12+
"en": "Turn left to stay on Ref1",
1313
"es": "Continúe izquierda en Ref1",
1414
"fr": "Continuer à gauche sur Ref1",
1515
"id": "Terus kiri ke Ref1",

0 commit comments

Comments
 (0)