Merge branch 'master' into moderation

[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..e31c053ef7877bb62b5469c3dcbd83e71df147a5 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -95,9 +95,41 @@ function OSRMEngine() {
         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/)) {
-          instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name } );
+          if (step.maneuver.exit) {
+            instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name } );
+          } else {
+            instText += I18n.t(template + '_without_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 } );
+            }
+          } else {
+            if (namedRoad) {
+              instText += I18n.t(template + '_without_exit', { name: name });
+            } else {
+              instText += I18n.t(template + '_without_directions');
+            }
+          }
         } else {
           instText += I18n.t(template + '_without_exit', { name: name });
         }
@@ -127,7 +159,7 @@ function OSRMEngine() {
         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')