Change roundabout exit logic and remove blank string from locale file

[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 84f085c5a6c942cc16f0cc8fcb6344989d7ff2db..38b22043010a9d6b76d1973192cc3e7cf7318416 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
       };
+      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;
 
@@ -111,8 +117,8 @@ function OSRMEngine() {
         }
 
         if (step.maneuver.type.match(/rotary|roundabout/)) {
-          if (step.maneuver.exit) {
-            instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name } );
+          if (step.maneuver.exit && step.maneuver.exit <= 10) {
+            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 } );
           }