Combine category and reporting user

[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 3d32f07e33a5b0582b9dc544c98f228dba4b15c7..84f085c5a6c942cc16f0cc8fcb6344989d7ff2db 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -95,8 +95,10 @@ function OSRMEngine() {
         Array.prototype.push.apply(line, step_geometry);
 
         var instText = "<b>" + (idx + 1) + ".</b> ";
-        
+        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) {
@@ -105,10 +107,24 @@ function OSRMEngine() {
           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/)) {
+          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 });
         }