Merge pull request #183 from Project-OSRM/merge-straight

mcwhittemore · web-flow · commit 49e3527e59cc · 2017-10-27T16:29:32.000-04:00
Add condition for merge straight
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/
 
+## master
+
+- Added a `merge straight` instruction [#183](https://github.com/Project-OSRM/osrm-text-instructions/pull/183)
+
 ## 0.10.4 2017-10-26
 
 - Add a phrase for an upcoming arrival step [#184](https://github.com/Project-OSRM/osrm-text-instructions/pull/184)
diff --git a/languages/translations/de.json b/languages/translations/de.json
@@ -192,6 +192,11 @@
                 "name": "{modifier} auffahren auf {way_name}",
                 "destination": "{modifier} auffahren Richtung {destination}"
             },
+            "straight": {
+                "default": "geradeaus auffahren",
+                "name": "geradeaus auffahren auf {way_name}",
+                "destination": "geradeaus auffahren Richtung {destination}"
+            },
             "slight left": {
                 "default": "Leicht links auffahren",
                 "name": "Leicht links auffahren auf {way_name}",
@@ -490,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/en.json b/languages/translations/en.json
@@ -192,6 +192,11 @@
                 "name": "Merge {modifier} onto {way_name}",
                 "destination": "Merge {modifier} towards {destination}"
             },
+            "straight": {
+                "default": "Merge",
+                "name": "Merge onto {way_name}",
+                "destination": "Merge towards {destination}"
+            },
             "slight left": {
                 "default": "Merge left",
                 "name": "Merge left onto {way_name}",
diff --git a/languages/translations/eo.json b/languages/translations/eo.json
@@ -192,6 +192,11 @@
                 "name": "Enveturu {modifier} al {way_name}",
                 "destination": "Enveturu {modifier} direkte al {destination}"
             },
+            "straight": {
+                "default": "Enveturu rekten",
+                "name": "Enveturu rekten al {way_name}",
+                "destination": "Enveturu rekten direkte al {destination}"
+            },
             "slight left": {
                 "default": "Enveturu de maldekstre",
                 "name": "Enveturu de maldekstre al {way_name}",
diff --git a/languages/translations/es-ES.json b/languages/translations/es-ES.json
@@ -192,6 +192,11 @@
                 "name": "Incorpórate {modifier} por {way_name}",
                 "destination": "Incorpórate {modifier} hacia {destination}"
             },
+            "straight": {
+                "default": "Incorpórate recto",
+                "name": "Incorpórate recto por {way_name}",
+                "destination": "Incorpórate recto hacia {destination}"
+            },
             "slight left": {
                 "default": "Incorpórate a la izquierda",
                 "name": "Incorpórate a la izquierda por {way_name}",
diff --git a/languages/translations/es.json b/languages/translations/es.json
@@ -192,6 +192,11 @@
                 "name": "Gire a {modifier} en {way_name}",
                 "destination": "Gire a {modifier} hacia {destination}"
             },
+            "straight": {
+                "default": "Gire  a recto",
+                "name": "Gire a recto en {way_name}",
+                "destination": "Gire a recto hacia {destination}"
+            },
             "slight left": {
                 "default": "Gire a la izquierda",
                 "name": "Gire a la izquierda en {way_name}",
diff --git a/languages/translations/fr.json b/languages/translations/fr.json
@@ -192,6 +192,11 @@
                 "name": "Rejoindre {modifier} sur {way_name}",
                 "destination": "Rejoindre {modifier} en direction de {destination}"
             },
+            "straight": {
+                "default": "Rejoindre tout droit",
+                "name": "Rejoindre tout droit sur {way_name}",
+                "destination": "Rejoindre tout droit en direction de {destination}"
+            },
             "slight left": {
                 "default": "Rejoindre par la gauche",
                 "name": "Rejoindre {way_name} par la gauche",
@@ -490,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/id.json b/languages/translations/id.json
@@ -192,6 +192,11 @@
                 "name": "Bergabung {modifier} ke arah {way_name}",
                 "destination": "Bergabung {modifier} menuju {destination}"
             },
+            "straight": {
+                "default": "Bergabung lurus",
+                "name": "Bergabung lurus ke arah {way_name}",
+                "destination": "Bergabung lurus menuju {destination}"
+            },
             "slight left": {
                 "default": "Bergabung di kiri",
                 "name": "Bergabung di kiri ke arah {way_name}",
@@ -490,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/it.json b/languages/translations/it.json
@@ -192,6 +192,11 @@
                 "name": "Immettiti {modifier} in {way_name}",
                 "destination": "Immettiti {modifier} verso {destination}"
             },
+            "straight": {
+                "default": "Immettiti a dritto",
+                "name": "Immettiti dritto in {way_name}",
+                "destination": "Immettiti dritto verso {destination}"
+            },
             "slight left": {
                 "default": "Immettiti a sinistra",
                 "name": "Immettiti a sinistra in {way_name}",
diff --git a/languages/translations/nl.json b/languages/translations/nl.json
@@ -192,6 +192,11 @@
                 "name": "Bij de splitsing {modifier} naar {way_name}",
                 "destination": "Bij de splitsing {modifier} richting {destination}"
             },
+            "straight": {
+                "default": "Bij de splitsing rechtdoor",
+                "name": "Bij de splitsing rechtdoor naar {way_name}",
+                "destination": "Bij de splitsing rechtdoor richting {destination}"
+            },
             "slight left": {
                 "default": "Bij de splitsing links aanhouden",
                 "name": "Bij de splitsing links aanhouden naar {way_name}",
@@ -490,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/pl.json b/languages/translations/pl.json
@@ -192,6 +192,11 @@
                 "name": "Włącz się {modifier} na {way_name}",
                 "destination": "Włącz się {modifier} w kierunku {destination}"
             },
+            "straight": {
+                "default": "Włącz się prosto",
+                "name": "Włącz się prosto na {way_name}",
+                "destination": "Włącz się prosto w kierunku {destination}"
+            },
             "slight left": {
                 "default": "Włącz się z lewej strony",
                 "name": "Włącz się z lewej strony na {way_name}",
diff --git a/languages/translations/pt-BR.json b/languages/translations/pt-BR.json
@@ -192,6 +192,11 @@
                 "name": "Entre {modifier} na {way_name}",
                 "destination": "Entre {modifier} em direção à {destination}"
             },
+            "straight": {
+                "default": "Entre reto",
+                "name": "Entre reto na {way_name}",
+                "destination": "Entre reto em direção à {destination}"
+            },
             "slight left": {
                 "default": "Entre à esquerda",
                 "name": "Entre à esquerda na {way_name}",
@@ -490,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/ro.json b/languages/translations/ro.json
@@ -192,6 +192,11 @@
                 "name": "Intrați în {modifier} pe {way_name}",
                 "destination": "Intrați în {modifier} spre {destination}"
             },
+            "straight": {
+                "default": "Intrați în înainte",
+                "name": "Intrați în înainte pe {way_name}",
+                "destination": "Intrați în înainte spre {destination}"
+            },
             "slight left": {
                 "default": "Intrați în stânga",
                 "name": "Intrați în stânga pe {way_name}",
diff --git a/languages/translations/ru.json b/languages/translations/ru.json
@@ -192,6 +192,11 @@
                 "name": "Перестройтесь {modifier} на {way_name:accusative}",
                 "destination": "Перестройтесь {modifier} в направлении {destination}"
             },
+            "straight": {
+                "default": "Перестройтесь прямо",
+                "name": "Перестройтесь прямо на {way_name:accusative}",
+                "destination": "Перестройтесь прямо в направлении {destination}"
+            },
             "slight left": {
                 "default": "Перестройтесь левее",
                 "name": "Перестройтесь левее на {way_name:accusative}",
@@ -490,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/sv.json b/languages/translations/sv.json
@@ -192,6 +192,11 @@
                 "name": "Byt till {modifier} körfält in på {way_name}",
                 "destination": "Byt till {modifier} körfält mot {destination}"
             },
+            "straight": {
+                "default": "Byt till rakt fram körfält",
+                "name": "Byt till rakt fram körfält in på {way_name}",
+                "destination": "Byt till rakt fram körfält mot {destination}"
+            },
             "slight left": {
                 "default": "Byt till vänstra körfältet",
                 "name": "Byt till vänstra körfältet in på {way_name}",
diff --git a/languages/translations/tr.json b/languages/translations/tr.json
@@ -192,6 +192,11 @@
                 "name": "{way_name} üzerinde {modifier} yöne gir",
                 "destination": "{destination} istikametinde {modifier} yöne gir"
             },
+            "straight": {
+                "default": "düz yöne gir",
+                "name": "{way_name} üzerinde düz yöne gir",
+                "destination": "{destination} istikametinde düz yöne gir"
+            },
             "slight left": {
                 "default": "Sola gir",
                 "name": "{way_name} üzerinde sola gir",
diff --git a/languages/translations/uk.json b/languages/translations/uk.json
@@ -192,6 +192,11 @@
                 "name": "Приєднайтеся до потоку {modifier} на {way_name}",
                 "destination": "Приєднайтеся до потоку {modifier} у напрямку {destination}"
             },
+            "straight": {
+                "default": "Приєднайтеся до потоку прямо",
+                "name": "Приєднайтеся до потоку прямо на {way_name}",
+                "destination": "Приєднайтеся до потоку прямо у напрямку {destination}"
+            },
             "slight left": {
                 "default": "Приєднайтеся до потоку ліворуч",
                 "name": "Приєднайтеся до потоку ліворуч на {way_name}",
@@ -490,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/vi.json b/languages/translations/vi.json
@@ -192,6 +192,11 @@
                 "name": "Nhập sang {modifier} vào {way_name}",
                 "destination": "Nhập sang {modifier} đến {destination}"
             },
+            "straight": {
+                "default": "Nhập sang thẳng",
+                "name": "Nhập sang thẳng vào {way_name}",
+                "destination": "Nhập sang thẳng đến {destination}"
+            },
             "slight left": {
                 "default": "Nhập sang trái",
                 "name": "Nhập sang trái vào {way_name}",
diff --git a/languages/translations/zh-Hans.json b/languages/translations/zh-Hans.json
@@ -155,6 +155,11 @@
                 "name": "{modifier}并道，上{way_name}",
                 "destination": "{modifier}并道，前往{destination}"
             },
+            "straight": {
+                "default": "直行并道",
+                "name": "直行并道，上{way_name}",
+                "destination": "直行并道，前往{destination}"
+            },
             "uturn": {
                 "default": "调头",
                 "name": "调头，上{way_name}",
@@ -365,4 +370,4 @@
             }
         }
     }
-}
+}
diff --git a/test/fixtures/v5/merge/straight_default.json b/test/fixtures/v5/merge/straight_default.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Geradeaus auffahren",
-        "en": "Merge straight",
+        "en": "Merge",
         "eo": "Enveturu rekten",
         "es": "Gire a recto",
         "es-ES": "Incorpórate recto",
diff --git a/test/fixtures/v5/merge/straight_destination.json b/test/fixtures/v5/merge/straight_destination.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Geradeaus auffahren Richtung Destination 1",
-        "en": "Merge straight towards Destination 1",
+        "en": "Merge towards Destination 1",
         "eo": "Enveturu rekten direkte al Destination 1",
         "es": "Gire a recto hacia Destination 1",
         "es-ES": "Incorpórate recto hacia Destination 1",
diff --git a/test/fixtures/v5/merge/straight_exit.json b/test/fixtures/v5/merge/straight_exit.json
@@ -9,7 +9,7 @@
     },
     "instructions": {
         "de": "Geradeaus auffahren auf Way Name",
-        "en": "Merge straight onto Way Name",
+        "en": "Merge onto Way Name",
         "eo": "Enveturu rekten al Way Name",
         "es": "Gire a recto en Way Name",
         "es-ES": "Incorpórate recto por Way Name",
diff --git a/test/fixtures/v5/merge/straight_exit_destination.json b/test/fixtures/v5/merge/straight_exit_destination.json
@@ -10,7 +10,7 @@
     },
     "instructions": {
         "de": "Geradeaus auffahren Richtung Destination 1",
-        "en": "Merge straight towards Destination 1",
+        "en": "Merge towards Destination 1",
         "eo": "Enveturu rekten direkte al Destination 1",
         "es": "Gire a recto hacia Destination 1",
         "es-ES": "Incorpórate recto hacia Destination 1",
diff --git a/test/fixtures/v5/merge/straight_name.json b/test/fixtures/v5/merge/straight_name.json
@@ -8,7 +8,7 @@
     },
     "instructions": {
         "de": "Geradeaus auffahren auf Way Name",
-        "en": "Merge straight onto Way Name",
+        "en": "Merge onto Way Name",
         "eo": "Enveturu rekten al Way Name",
         "es": "Gire a recto en Way Name",
         "es-ES": "Incorpórate recto por Way Name",
diff --git a/test/languages_test.js b/test/languages_test.js
@@ -62,6 +62,8 @@ tape.test('verify language files structure', function(assert) {
             );
         }
 
+        assert.ok(translation.v5.merge.straight, l + ' has merge straight key');
+
     });
 
     assert.end();

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,11 @@`
`192`	`192`	`"name": "{modifier} auffahren auf {way_name}",`
`193`	`193`	`"destination": "{modifier} auffahren Richtung {destination}"`
`194`	`194`	`},`
	`195`	`+ "straight": {`
	`196`	`+ "default": "geradeaus auffahren",`
	`197`	`+ "name": "geradeaus auffahren auf {way_name}",`
	`198`	`+ "destination": "geradeaus auffahren Richtung {destination}"`
	`199`	`+ },`
`195`	`200`	`"slight left": {`
`196`	`201`	`"default": "Leicht links auffahren",`
`197`	`202`	`"name": "Leicht links auffahren auf {way_name}",`
`@@ -490,4 +495,4 @@`
`490`	`495`	`}`
`491`	`496`	`}`
`492`	`497`	`}`
`493`		`-}`
	`498`	`+}`