Merge remote-tracking branch 'openstreetmap/pull/954'

[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..2ee9da12b1d78dbce1f057d9f706e5d4fa374692 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -12,43 +12,50 @@ function OSRMEngine() {
     getRoute: function (points, callback) {
       var TURN_INSTRUCTIONS = [
         "",
     getRoute: function (points, callback) {
       var TURN_INSTRUCTIONS = [
         "",

-        I18n.t('javascripts.directions.instructions.continue_on'),      // 1
-        I18n.t('javascripts.directions.instructions.slight_right'),     // 2
-        I18n.t('javascripts.directions.instructions.turn_right'),       // 3
-        I18n.t('javascripts.directions.instructions.sharp_right'),      // 4
-        I18n.t('javascripts.directions.instructions.uturn'),            // 5
-        I18n.t('javascripts.directions.instructions.sharp_left'),       // 6
-        I18n.t('javascripts.directions.instructions.turn_left'),        // 7
-        I18n.t('javascripts.directions.instructions.slight_left'),      // 8
-        I18n.t('javascripts.directions.instructions.via_point'),        // 9
-        I18n.t('javascripts.directions.instructions.follow'),           // 10
-        I18n.t('javascripts.directions.instructions.roundabout'),       // 11
-        I18n.t('javascripts.directions.instructions.leave_roundabout'), // 12
-        I18n.t('javascripts.directions.instructions.stay_roundabout'),  // 13
-        I18n.t('javascripts.directions.instructions.start'),            // 14
-        I18n.t('javascripts.directions.instructions.destination'),      // 15
-        I18n.t('javascripts.directions.instructions.against_oneway'),   // 16
-        I18n.t('javascripts.directions.instructions.end_oneway')        // 17
+        'javascripts.directions.instructions.continue',         // 1
+        'javascripts.directions.instructions.slight_right',     // 2
+        'javascripts.directions.instructions.turn_right',       // 3
+        'javascripts.directions.instructions.sharp_right',      // 4
+        'javascripts.directions.instructions.uturn',            // 5
+        'javascripts.directions.instructions.sharp_left',       // 6
+        'javascripts.directions.instructions.turn_left',        // 7
+        'javascripts.directions.instructions.slight_left',      // 8
+        'javascripts.directions.instructions.via_point',        // 9
+        'javascripts.directions.instructions.follow',           // 10
+        'javascripts.directions.instructions.roundabout',       // 11
+        'javascripts.directions.instructions.leave_roundabout', // 12
+        'javascripts.directions.instructions.stay_roundabout',  // 13
+        'javascripts.directions.instructions.start',            // 14
+        'javascripts.directions.instructions.destination',      // 15
+        'javascripts.directions.instructions.against_oneway',   // 16
+        'javascripts.directions.instructions.end_oneway',       // 17
+        'javascripts.directions.instructions.ferry'             // 18

       ];
 
       ];
 

-      var url = document.location.protocol + "//router.project-osrm.org/viaroute?z=14&output=json&instructions=true";
+      var params = [
+        { name: "z", value: "14" },
+        { name: "output", value: "json" },
+        { name: "instructions", value: true }
+      ];

 
       for (var i = 0; i < points.length; i++) {
 
       for (var i = 0; i < points.length; i++) {

-        url += "&loc=" + points[i].lat + ',' + points[i].lng;
+        params.push({ name: "loc", value: points[i].lat + "," + points[i].lng });
+

         if (hintData && previousPoints && previousPoints[i].equals(points[i])) {
         if (hintData && previousPoints && previousPoints[i].equals(points[i])) {

-          url += "&hint=" + hintData.locations[i];
+          params.push({ name: "hint", value: hintData.locations[i] });

         }
       }
 
       if (hintData && hintData.checksum) {
         }
       }
 
       if (hintData && hintData.checksum) {

-        url += "&checksum=" + hintData.checksum;
+        params.push({ name: "checksum", value: hintData.checksum });

       }
 
       }
 

-      $.ajax({
-        url: url,
-        dataType: 'json',
+      return $.ajax({
+        url: document.location.protocol + OSM.OSRM_URL,
+        data: params,
+        dataType: "json",

         success: function (data) {
         success: function (data) {

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

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


@@ -63,32 +70,38 @@ function OSRMEngine() {
             var s = data.route_instructions[i];
             var linesegend;
             var instCodes = s[0].split('-');
             var s = data.route_instructions[i];
             var linesegend;
             var instCodes = s[0].split('-');

-            var instText = "<b>" + (i + 1) + ".</b> ";
-            instText += TURN_INSTRUCTIONS[instCodes[0]];
-            if (instCodes[1]) {
-              instText += "exit " + instCodes[1] + " ";
+            if (s[8] === 2) {
+              /* indicates a ferry in car routing mode, see https://github.com/Project-OSRM/osrm-backend/blob/6cbbd1e5a1b441eb27055f56956e1bac14832a58/profiles/car.lua#L151 */
+              instCodes = ["18"];

             }
             }

-            if (instCodes[0] != 15) {
-              instText += s[1] ? "<b>" + s[1] + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
+            var instText = "<b>" + (i + 1) + ".</b> ";
+            var name = s[1] ? "<b>" + s[1] + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
+            if (instCodes[0] === "11" && instCodes[1]) {
+              instText += I18n.t(TURN_INSTRUCTIONS[instCodes[0]] + '_with_exit', { exit: instCodes[1], name: name } );
+            } else {
+              instText += I18n.t(TURN_INSTRUCTIONS[instCodes[0]] + '_without_exit', { name: name });

             }
             if ((i + 1) < data.route_instructions.length) {
               linesegend = data.route_instructions[i + 1][3] + 1;
             } else {
               linesegend = s[3] + 1;
             }
             }
             if ((i + 1) < data.route_instructions.length) {
               linesegend = data.route_instructions[i + 1][3] + 1;
             } else {
               linesegend = s[3] + 1;
             }

-            steps.push([line[s[3]], s[0].split('-')[0], instText, s[2], line.slice(s[3], linesegend)]);
+            steps.push([line[s[3]], instCodes[0], instText, s[2], line.slice(s[3], linesegend)]);

           }
 
           }
 

-          callback(null, {
+          callback(false, {

             line: line,
             steps: steps,
             distance: data.route_summary.total_distance,
             time: data.route_summary.total_time
           });
             line: line,
             steps: steps,
             distance: data.route_summary.total_distance,
             time: data.route_summary.total_time
           });

+        },
+        error: function () {
+          callback(true);

         }
       });
     }
   };
 }
 
         }
       });
     }
   };
 }
 

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