Add distance and phrase support

- Adds three phrases to the English translations for combining instructions and referencing instruction in relation to distance. - Adds `distance` support to the English `continue.default` and `continue.straight` instructions. - Adds a `distanceunits` constants object and fills this out in English for basic driving units in both the metric and imperial systems.
Project-OSRM · Sep 6, 2017 · cfb2890 · cfb2890
1 parent 708583d
commit cfb2890
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 22 deletions.
diff --git a/languages/translations/de.json b/languages/translations/de.json
@@ -41,7 +41,8 @@
                 "ox": "Links halten",
                 "xox": "Mittlere Spur nutzen",
                 "oxo": "Rechts oder links halten"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Fähre nehmen Richtung {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Sie haben Ihr {nth} Ziel erreicht"
@@ -413,4 +415,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/en.json b/languages/translations/en.json
@@ -41,6 +41,16 @@
                 "ox": "Keep left",
                 "xox": "Keep in the middle",
                 "oxo": "Keep left or right"
+            },
+            "distanceunits": {
+              "feet": "feet",
+              "foot": "foot",
+              "miles": "miles",
+              "mile": "mile",
+              "meter": "meter",
+              "meters": "meters",
+              "kilometer": "kilometer",
+              "kilometers": "kilometers"
             }
         },
         "modes": {
@@ -50,6 +60,11 @@
                 "destination": "Take the ferry towards {destination}"
             }
         },
+        "phrase": {
+            "twolinkedbydistance": "{instruction_one} then in {distance} {instruction_two}",
+            "twolinked": "{instruction_one} then {instruction_two}",
+            "oneindistance": "In {distance}, {instruction_one}"
+        },
         "arrive": {
             "default": {
                 "default": "You have arrived at your {nth} destination"
@@ -80,12 +95,15 @@
             "default": {
                 "default": "Continue {modifier}",
                 "name": "Continue {modifier} onto {way_name}",
-                "destination": "Continue {modifier} towards {destination}"
+                "destination": "Continue {modifier} towards {destination}",
+                "distance": "Continue for {distance}",
+                "namedistance": "Continue on {way_name} for {distance}"
             },
             "straight": {
                 "default": "Continue straight",
                 "name": "Continue onto {way_name}",
-                "destination": "Continue towards {destination}"
+                "destination": "Continue towards {destination}",
+                "distance": "Continue straight for {distance}"
             },
             "slight left": {
                 "default": "Continue slightly left",

diff --git a/languages/translations/es.json b/languages/translations/es.json
@@ -41,7 +41,8 @@
                 "ox": "Mantengase a la izquierda",
                 "xox": "Mantengase en el medio",
                 "oxo": "Mantengase a la izquierda o derecha"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Coge el ferry a  {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Has llegado a tu {nth} destino"
@@ -418,4 +420,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/fr.json b/languages/translations/fr.json
@@ -41,7 +41,8 @@
                 "ox": "Serrer à gauche",
                 "xox": "Rester au milieu",
                 "oxo": "Rester à gauche ou à droite"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Prendre le ferry en direction de {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Vous êtes arrivés à votre {nth} destination"

diff --git a/languages/translations/id.json b/languages/translations/id.json
@@ -41,7 +41,8 @@
                 "ox": "Tetap di kiri",
                 "xox": "Tetap di tengah",
                 "oxo": "Tetap di kiri atau kanan"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Naik ferry menuju {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Anda telah tiba di tujuan ke-{nth}"

diff --git a/languages/translations/it.json b/languages/translations/it.json
@@ -41,7 +41,8 @@
                 "ox": "Mantieni la sinistra",
                 "xox": "Rimani in mezzo",
                 "oxo": "Mantieni la destra o la sinistra"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Prendi il traghetto verso {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Sei arrivato alla tua {nth} destinazione"

diff --git a/languages/translations/nl.json b/languages/translations/nl.json
@@ -41,7 +41,8 @@
                 "ox": "Links aanhouden",
                 "xox": "In het midden blijven",
                 "oxo": "Links of rechts blijven"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Neem het veer naar {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Je bent gearriveerd op de {nth} bestemming."

diff --git a/languages/translations/pl.json b/languages/translations/pl.json
@@ -41,7 +41,8 @@
                 "ox": "Trzymaj się lewej strony",
                 "xox": "Trzymaj się środka",
                 "oxo": "Trzymaj się lewej lub prawej strony"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Weź prom w kierunku {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Dojechano do miejsca docelowego {nth}"

diff --git a/languages/translations/pt-BR.json b/languages/translations/pt-BR.json
@@ -41,7 +41,8 @@
                 "ox": "Mantenha-se à esquerda",
                 "xox": "Mantenha-se ao centro",
                 "oxo": "Mantenha-se à esquerda ou direita"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Pegue a balsa sentido {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Você chegou ao seu {nth} destino"
@@ -418,4 +420,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/ru.json b/languages/translations/ru.json
@@ -41,7 +41,8 @@
                 "ox": "Держитесь левее",
                 "xox": "Держитесь посередине",
                 "oxo": "Держитесь слева или справа"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Погрузитесь на паром в направлении {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Вы прибыли в {nth} пункт назначения"
@@ -418,4 +420,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/sv.json b/languages/translations/sv.json
@@ -41,7 +41,8 @@
                 "ox": "Håll till vänster",
                 "xox": "Håll till mitten",
                 "oxo": "Håll till vänster eller höger"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Ta färjan mot {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Du är framme vid din {nth} destination"
@@ -418,4 +420,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/uk.json b/languages/translations/uk.json
@@ -41,7 +41,8 @@
                 "ox": "Тримайтесь ліворуч",
                 "xox": "Тримайтесь в середині",
                 "oxo": "Тримайтесь праворуч або ліворуч"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Скористайтесь поромом у напрямку {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Ви прибули у ваш {nth} пункт призначення"
@@ -418,4 +420,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/vi.json b/languages/translations/vi.json
@@ -41,7 +41,8 @@
                 "ox": "Đi bên trái",
                 "xox": "Đi vào giữa",
                 "oxo": "Đi bên trái hay bên phải"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "Lên phà đi {destination}"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "Đến nơi {nth}"
@@ -418,4 +420,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/zh-Hans.json b/languages/translations/zh-Hans.json
@@ -41,7 +41,8 @@
                 "ox": "靠左直行",
                 "xox": "保持在道路中间直行",
                 "oxo": "保持在道路两侧直行"
-            }
+            },
+            "distanceunits": {}
         },
         "modes": {
             "ferry": {
@@ -50,6 +51,7 @@
                 "destination": "乘坐开往{destination}的轮渡"
             }
         },
+        "phrase": {},
         "arrive": {
             "default": {
                 "default": "您已经到达您的{nth}个目的地"