Simplify merge instructions (#67)

Author: freenerd

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. For change
 
 - put future changes here
 - Run tests per language via LANGUAGE=de npm test
+- Shorter merge instructions (Merge slightly left -> Merge left)
 
 # 0.0.5 2016-10-26
 

instructions/en.json

@@ -160,24 +160,24 @@
                 "destination": "Merge {modifier} towards {destination}"
             },
             "slight left": {
-                "default": "Merge slightly left",
-                "name": "Merge slightly left onto {way_name}",
-                "destination": "Merge slightly left towards {destination}"
+                "default": "Merge left",
+                "name": "Merge left onto {way_name}",
+                "destination": "Merge left towards {destination}"
             },
             "slight right": {
-                "default": "Merge slightly right",
-                "name": "Merge slightly right onto {way_name}",
-                "destination": "Merge slightly right towards {destination}"
+                "default": "Merge right",
+                "name": "Merge right onto {way_name}",
+                "destination": "Merge right towards {destination}"
             },
             "sharp left": {
-                "default": "Merge sharply left",
-                "name": "Merge sharply left onto {way_name}",
-                "destination": "Merge sharply left towards {destination}"
+                "default": "Merge left",
+                "name": "Merge left onto {way_name}",
+                "destination": "Merge left towards {destination}"
             },
             "sharp right": {
-                "default": "Merge sharply right",
-                "name": "Merge sharply right onto {way_name}",
-                "destination": "Merge sharply right towards {destination}"
+                "default": "Merge right",
+                "name": "Merge right onto {way_name}",
+                "destination": "Merge right towards {destination}"
             },
             "uturn": {
                 "default": "Make a U-turn",

scripts/generate_fixtures.js

@@ -4,7 +4,7 @@ var fs = require('fs');
 var path = require('path');
 
 var instructions = require('../index.js');
-var v5Instructions = instructions('v5');
+var v5Instructions = instructions('v5', 'en');
 var constants = require('../test/constants');
 var type = process.argv[2];
 
@@ -144,6 +144,7 @@ function execute() {
         };
         write(baseStep, path.join(basePath, 'way_name_ref_mapbox_hack_2'));
         break;
+    case 'merge':
     case 'turn':
         // do variation per modifier
         constants.modifiers.forEach((modifier) => {

test/fixtures/v5/merge/left.json

@@ -1,8 +1,8 @@
 {
     "step": {
         "maneuver": {
-            "modifier": "left",
-            "type": "merge"
+            "type": "merge",
+            "modifier": "left"
         },
         "name": ""
     },

test/fixtures/v5/merge/left_no_name.json test/fixtures/v5/merge/left_default.jsontest/fixtures/v5/merge/left_no_name.json renamed to test/fixtures/v5/merge/left_default.json

@@ -0,0 +1,11 @@
+{
+    "step": {
+        "maneuver": {
+            "type": "merge",
+            "modifier": "left"
+        },
+        "name": "Way Name",
+        "destinations": "Destination 1,Destination 2"
+    },
+    "instruction": "Merge left towards Destination 1"
+}

test/fixtures/v5/merge/left_destination.json

@@ -0,0 +1,10 @@
+{
+    "step": {
+        "maneuver": {
+            "type": "merge",
+            "modifier": "left"
+        },
+        "name": "Way Name"
+    },
+    "instruction": "Merge left onto Way Name"
+}

test/fixtures/v5/merge/left_name.json

@@ -1,8 +1,8 @@
 {
     "step": {
         "maneuver": {
-            "modifier": "right",
-            "type": "merge"
+            "type": "merge",
+            "modifier": "right"
         },
         "name": ""
     },

test/fixtures/v5/merge/right.json

@@ -0,0 +1,11 @@
+{
+    "step": {
+        "maneuver": {
+            "type": "merge",
+            "modifier": "right"
+        },
+        "name": "Way Name",
+        "destinations": "Destination 1,Destination 2"
+    },
+    "instruction": "Merge right towards Destination 1"
+}