Don't pass the locale to the Mapzen routing engine

[rails.git] / app / assets / javascripts / index / directions / mapquest.js

diff --git a/app/assets/javascripts/index/directions/mapquest.js b/app/assets/javascripts/index/directions/mapquest.js
index 935a1ca4c38e9c8dcdaf9245ede8d336bb0077a9..0f645ceeb7f35e621369d080517887f82154595d 100644 (file)
--- a/app/assets/javascripts/index/directions/mapquest.js
+++ b/app/assets/javascripts/index/directions/mapquest.js
@@ -3,7 +3,7 @@
 // http://open.mapquestapi.com/directions/
 // https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153
 
 // http://open.mapquestapi.com/directions/
 // https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153
 

-function MapQuestEngine(id, vehicleParam) {
+function MapQuestEngine(id, routeType) {

   var MQ_SPRITE_MAP = {
     0: 1, // straight
     1: 2, // slight right
   var MQ_SPRITE_MAP = {
     0: 1, // straight
     1: 2, // slight right


@@ -28,29 +28,35 @@ function MapQuestEngine(id, vehicleParam) {
 
   return {
     id: id,
 
   return {
     id: id,

-    creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',
+    creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="' + document.location.protocol + '//developer.mapquest.com/content/osm/mq_logo.png">',

     draggable: false,
 
     getRoute: function (points, callback) {
     draggable: false,
 
     getRoute: function (points, callback) {

-      var url = document.location.protocol + "//open.mapquestapi.com/directions/v2/route?key=Fmjtd%7Cluur290anu%2Crl%3Do5-908a0y";

       var from = points[0];
       var to = points[points.length - 1];
       var from = points[0];
       var to = points[points.length - 1];

-      url += "&from=" + from.lat + ',' + from.lng;
-      url += "&to=" + to.lat + ',' + to.lng;
-      url += "&" + vehicleParam;
-      //url+="&locale=" + I18n.currentLocale(); //Doesn't actually work. MapQuest requires full locale e.g. "de_DE", but I18n may only provides language, e.g. "de"
-      url += "&manMaps=false";
-      url += "&shapeFormat=raw&generalize=0&unit=k";

 
 

-      $.ajax({
-        url: url,
+      return $.ajax({
+        url: document.location.protocol + OSM.MAPQUEST_DIRECTIONS_URL,
+        data: {
+          key: OSM.MAPQUEST_KEY,
+          from: from.lat + "," + from.lng,
+          to: to.lat + "," + to.lng,
+          routeType: routeType,
+          // locale: I18n.currentLocale(), //Doesn't actually work. MapQuest requires full locale e.g. "de_DE", but I18n may only provides language, e.g. "de"
+          manMaps: false,
+          shapeFormat: "raw",
+          generalize: 0,
+          unit: "k"
+        },
+        dataType: "jsonp",

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

-          if (data.info.statuscode != 0)
+          if (data.info.statuscode !== 0)

             return callback(true);
 
             return callback(true);
 

+          var i;

           var line = [];
           var shape = data.route.shape.shapePoints;
           var line = [];
           var shape = data.route.shape.shapePoints;

-          for (var i = 0; i < shape.length; i += 2) {
+          for (i = 0; i < shape.length; i += 2) {

             line.push(L.latLng(shape[i], shape[i + 1]));
           }
 
             line.push(L.latLng(shape[i], shape[i + 1]));
           }
 


@@ -58,12 +64,12 @@ function MapQuestEngine(id, vehicleParam) {
           // data.route.legs[0].maneuvers is list of turns
           var steps = [];
           var mq = data.route.legs[0].maneuvers;
           // data.route.legs[0].maneuvers is list of turns
           var steps = [];
           var mq = data.route.legs[0].maneuvers;

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

             var s = mq[i];
             var d;
             var linesegstart, linesegend, lineseg;
             linesegstart = data.route.shape.maneuverIndexes[i];
             var s = mq[i];
             var d;
             var linesegstart, linesegend, lineseg;
             linesegstart = data.route.shape.maneuverIndexes[i];

-            if (i == mq.length - 1) {
+            if (i === mq.length - 1) {

               d = 15;
               linesegend = linesegstart + 1;
             } else {
               d = 15;
               linesegend = linesegstart + 1;
             } else {


@@ -77,18 +83,23 @@ function MapQuestEngine(id, vehicleParam) {
             steps.push([L.latLng(s.startPoint.lat, s.startPoint.lng), d, s.narrative, s.distance * 1000, lineseg]);
           }
 
             steps.push([L.latLng(s.startPoint.lat, s.startPoint.lng), d, s.narrative, s.distance * 1000, lineseg]);
           }
 

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

             line: line,
             steps: steps,
             distance: data.route.distance * 1000,
             line: line,
             steps: steps,
             distance: data.route.distance * 1000,

-            time: data.route['time']
+            time: data.route.time

           });
           });

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

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

-OSM.Directions.addEngine(MapQuestEngine("mapquest_bicycle", "routeType=bicycle"), true);
-OSM.Directions.addEngine(MapQuestEngine("mapquest_foot", "routeType=pedestrian"), true);
-OSM.Directions.addEngine(MapQuestEngine("mapquest_car", "routeType=fastest"), true);
+if (OSM.MAPQUEST_KEY) {
+  OSM.Directions.addEngine(new MapQuestEngine("mapquest_bicycle", "bicycle"), true);
+  OSM.Directions.addEngine(new MapQuestEngine("mapquest_foot", "pedestrian"), true);
+  OSM.Directions.addEngine(new MapQuestEngine("mapquest_car", "fastest"), true);
+}