Fix warnings from rubocop update

[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 05cb32f2093647f2c37acc73b95c0b34f349fa9e..2156bf309252c4e1fa50c3f0e657e0fe8e71bcf1 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -44,11 +44,11 @@ function OSRMEngine() {
         url += "&checksum=" + hintData.checksum;
       }
 
         url += "&checksum=" + hintData.checksum;
       }
 

-      $.ajax({
+      return $.ajax({

         url: url,
         dataType: 'json',
         success: function (data) {
         url: url,
         dataType: 'json',
         success: function (data) {

-          if (data.status == 207)
+          if (data.status === 207)

             return callback(true);
 
           previousPoints = points;
             return callback(true);
 
           previousPoints = points;


@@ -66,9 +66,10 @@ function OSRMEngine() {
             var instText = "<b>" + (i + 1) + ".</b> ";
             instText += TURN_INSTRUCTIONS[instCodes[0]];
             if (instCodes[1]) {
             var instText = "<b>" + (i + 1) + ".</b> ";
             instText += TURN_INSTRUCTIONS[instCodes[0]];
             if (instCodes[1]) {

-              instText += "exit " + instCodes[1] + " ";
+              instText += I18n.t('javascripts.directions.instructions.exit', { exit: instCodes[1] } );

             }
             }

-            if (instCodes[0] != 15) {
+            if (instCodes[0] !== 15) {
+              instText += " ";

               instText += s[1] ? "<b>" + s[1] + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
             }
             if ((i + 1) < data.route_instructions.length) {
               instText += s[1] ? "<b>" + s[1] + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
             }
             if ((i + 1) < data.route_instructions.length) {


@@ -91,4 +92,4 @@ function OSRMEngine() {
   };
 }
 
   };
 }
 

-OSM.Directions.addEngine(OSRMEngine(), true);
+OSM.Directions.addEngine(new OSRMEngine(), true);