Merge pull request #177 from Project-OSRM/depart-distance

lyzidiamond · web-flow · commit fb54072a14a0 · 2017-10-18T16:31:58.000-07:00
add depart with distance
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. For change
 
 - Added a `formatToken` option to `compile`, `getWayName`, and `tokenize` that allows you to manipulate any token value after any grammar or capitalization rules are applied but before the value is inserted into the instruction. [#170](https://github.com/Project-OSRM/osrm-text-instructions/pull/170)
 - Removed the `options` parameter to this module, including the `tokenizedInstruction` hook. Use the `formatToken` option instead. [#170](https://github.com/Project-OSRM/osrm-text-instructions/pull/170)
+- Added `namedistance` option to the depart instructions and added tests for `namedistance` in depart and continue instructions. Some typo fixes. [#177](https://github.com/Project-OSRM/osrm-text-instructions/pull/177#discussion_r145279715)
 
 ## 0.9.0 2017-10-05
 
diff --git a/languages/translations/de.json b/languages/translations/de.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Fahren Sie Richtung {direction}",
-                "name": "Fahren Sie Richtung {direction} auf {way_name}"
+                "name": "Fahren Sie Richtung {direction} auf {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/en.json b/languages/translations/en.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Head {direction}",
-                "name": "Head {direction} on {way_name}"
+                "name": "Head {direction} on {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/eo.json b/languages/translations/eo.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Direktiĝu {direction}",
-                "name": "Direktiĝu {direction} al {way_name}"
+                "name": "Direktiĝu {direction} al {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/es-ES.json b/languages/translations/es-ES.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Dirígete al {direction}",
-                "name": "Dirígete al {direction} por {way_name}"
+                "name": "Dirígete al {direction} por {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/es.json b/languages/translations/es.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Ve a {direction}",
-                "name": "Ve a {direction} en {way_name}"
+                "name": "Ve a {direction} en {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/fr.json b/languages/translations/fr.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Rouler vers {direction}",
-                "name": "Rouler vers {direction} sur {way_name}"
+                "name": "Rouler vers {direction} sur {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/id.json b/languages/translations/id.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Arah {direction}",
-                "name": "Arah {direction} di {way_name}"
+                "name": "Arah {direction} di {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/it.json b/languages/translations/it.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Continua verso {direction}",
-                "name": "Continua verso {direction} in {way_name}"
+                "name": "Continua verso {direction} in {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/nl.json b/languages/translations/nl.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Vertrek in {direction}elijke richting",
-                "name": "Neem {way_name} in {direction}elijke richting"
+                "name": "Neem {way_name} in {direction}elijke richting",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/pl.json b/languages/translations/pl.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Kieruj się {direction}",
-                "name": "Kieruj się {direction} na {way_name}"
+                "name": "Kieruj się {direction} na {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/pt-BR.json b/languages/translations/pt-BR.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Siga {direction}",
-                "name": "Siga {direction} em {way_name}"
+                "name": "Siga {direction} em {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/ro.json b/languages/translations/ro.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Mergeți {direction}",
-                "name": "Mergeți {direction} pe {way_name}"
+                "name": "Mergeți {direction} pe {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/ru.json b/languages/translations/ru.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Двигайтесь в {direction} направлении",
-                "name": "Двигайтесь в {direction} направлении по {way_name:dative}"
+                "name": "Двигайтесь в {direction} направлении по {way_name:dative}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/sv.json b/languages/translations/sv.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Kör åt {direction}",
-                "name": "Kör åt {direction} på {way_name}"
+                "name": "Kör åt {direction} på {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/tr.json b/languages/translations/tr.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "{direction} tarafına yönelin",
-                "name": "{way_name} üzerinde {direction} yöne git"
+                "name": "{way_name} üzerinde {direction} yöne git",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/uk.json b/languages/translations/uk.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Прямуйте на {direction}",
-                "name": "Прямуйте на {direction} по {way_name}"
+                "name": "Прямуйте на {direction} по {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/vi.json b/languages/translations/vi.json
@@ -125,7 +125,8 @@
         "depart": {
             "default": {
                 "default": "Đi về hướng {direction}",
-                "name": "Đi về hướng {direction} trên {way_name}"
+                "name": "Đi về hướng {direction} trên {way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/languages/translations/zh-Hans.json b/languages/translations/zh-Hans.json
@@ -108,7 +108,8 @@
         "depart": {
             "default": {
                 "default": "出发向{direction}",
-                "name": "出发向{direction}，上{way_name}"
+                "name": "出发向{direction}，上{way_name}",
+                "namedistance": "Head {direction} on {way_name} for {distance}"
             }
         },
         "end of road": {
diff --git a/test/fixtures_test.js b/test/fixtures_test.js
@@ -14,7 +14,7 @@ var instructions = languages.instructions;
 var version = 'v5';
 var compiler = require('../index.js')(version);
 
-tape.test('verify existance/update fixtures', function(assert) {
+tape.test('verify existence/update fixtures', function(assert) {
     function clone(obj) {
         return JSON.parse(JSON.stringify(obj));
     }
@@ -57,7 +57,7 @@ tape.test('verify existance/update fixtures', function(assert) {
             // check for existance
             assert.ok(
                 fs.existsSync(fileName),
-                `verified existance of ${testName}`
+                `verified existence of ${testName}`
             );
         }
     }
diff --git a/test/languages_test.js b/test/languages_test.js
@@ -8,6 +8,9 @@ tape.test('verify language files structure', function(assert) {
     var translations = languages.instructions;
     var english = translations.en;
 
+    assert.ok(english.v5.depart.default.namedistance, 'en.js has depart namedistance');
+    assert.ok(english.v5.continue.straight.namedistance, 'en.js has continue straight namedistance');
+
     Object.keys(translations).forEach((l) => {
         if (l === 'en') return; // do not need to compare to self
         var translation = translations[l];
@@ -23,14 +26,30 @@ tape.test('verify language files structure', function(assert) {
             assert.deepEqual(
                 Object.keys(translation.v5.constants[c]),
                 Object.keys(english.v5.constants[c]),
-                l + ' has correct contant ' + c + ' keys');
+                l + ' has correct constant ' + c + ' keys');
         });
 
         assert.deepEqual(
             Object.keys(translation.v5.rotary.default),
             Object.keys(english.v5.rotary.default),
             l + ' has correct rotary variance keys'
         );
+
+        assert.deepEqual(
+            Object.keys(translation.v5.depart.default),
+            Object.keys(english.v5.depart.default),
+            l + ' has correct depart namedistance keys'
+        );
+
+        // exclude zh-Hans until full translation is available
+        if (l !== 'zh-Hans') {
+            assert.deepEqual(
+                Object.keys(translation.v5.continue.straight),
+                Object.keys(english.v5.continue.straight),
+                l + ' has correct continue straight namedistance keys'
+            );
+        }
+
     });
 
     assert.end();
