Merge branch 'master' into convert_roundabout_exits

[rails.git] / app / assets / javascripts / index / directions / osrm.js

diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js
index 5c29f6c4d4a55cf758309860baccb2bd00e957d2..e249ce1f56311c29f3119d5785484bc9adb3090a 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -60,6 +60,12 @@ function OSRMEngine() {
         'depart': 8,
         'arrive': 14
       };
         'depart': 8,
         'arrive': 14
       };

+      var numToWord = function(num) {
+        if(num > 10) {
+          num = 11;
+        }
+        return ["zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "gt_ten"][num];
+      };

       var transformed_steps = input_steps.map(function(step, idx) {
         var maneuver_id;
 
       var transformed_steps = input_steps.map(function(step, idx) {
         var maneuver_id;
 


@@ -111,21 +117,20 @@ function OSRMEngine() {
         }
 
         if (step.maneuver.type.match(/rotary|roundabout/)) {
         }
 
         if (step.maneuver.type.match(/rotary|roundabout/)) {

-          instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name } );
-        } else if (step.maneuver.type.match(/on ramp|off ramp/)) {
-          if (step.destinations) {
-            if (namedRoad) {
-              instText += I18n.t(template + '_with_name_and_directions', { name: name, directions: destinations } );
-            } else {
-              instText += I18n.t(template + '_with_directions', { directions: destinations } );
-            }
+          if (step.maneuver.exit) {
+            instText += I18n.t(template + '_with_exit', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name } );

           } else {
           } else {

-            if (namedRoad) {
-              instText += I18n.t(template + '_without_exit', { name: name });
-            } else {
-              instText += I18n.t(template + '_without_directions');
-            }
+            instText += I18n.t(template + '_without_exit', { name: name } );
+          }
+        } else if (step.maneuver.type.match(/on ramp|off ramp/)) {
+          var params = {};
+          if (step.exits && step.maneuver.type.match(/off ramp/)) params.exit = step.exits;
+          if (step.destinations) params.directions = destinations;
+          if (namedRoad) params.directions = name;
+          if (Object.keys(params).length > 0) {
+            template = template + "_with_" + Object.keys(params).join("_");

           }
           }

+          instText += I18n.t(template, params);

         } else {
           instText += I18n.t(template + '_without_exit', { name: name });
         }
         } else {
           instText += I18n.t(template + '_without_exit', { name: name });
         }