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 69191e65a6b448516044cf5a9c8280a5a2212788..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;
 


@@ -95,9 +101,36 @@ function OSRMEngine() {
         Array.prototype.push.apply(line, step_geometry);
 
         var instText = "<b>" + (idx + 1) + ".</b> ";
         Array.prototype.push.apply(line, step_geometry);
 
         var instText = "<b>" + (idx + 1) + ".</b> ";

-        var name = step.name ? "<b>" + step.name + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
+        var destinations = "<b>" + step.destinations + "</b>";
+        var namedRoad = true;
+        var name;
+
+        if (step.name && step.ref) {
+          name = "<b>" + step.name + " (" + step.ref + ")</b>";
+        } else if (step.name) {
+          name = "<b>" + step.name + "</b>";
+        } else if (step.ref) {
+          name = "<b>" + step.ref + "</b>";
+        } else {
+          name = I18n.t('javascripts.directions.instructions.unnamed');
+          namedRoad = false;
+        }
+

         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 } );
+          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 {
+            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 });
         }


@@ -127,7 +160,7 @@ function OSRMEngine() {
         return p.lng + ',' + p.lat;
       }).join(';');
 
         return p.lng + ',' + p.lat;
       }).join(';');
 

-      var req_url = document.location.protocol + OSM.OSRM_URL + encoded_coords;
+      var req_url = OSM.OSRM_URL + encoded_coords;

 
       var onResponse = function (data) {
         if (data.code !== 'Ok')
 
       var onResponse = function (data) {
         if (data.code !== 'Ok')