X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6e9a76e64def7f6d64cac37ea2db666327c47747..cb87f02642d0097ebc067ca1f9371dde274a41e3:/app/assets/javascripts/index/directions/mapquest.js?ds=inline

diff --git a/app/assets/javascripts/index/directions/mapquest.js b/app/assets/javascripts/index/directions/mapquest.js
index 112d17bcb..fcc47f103 100644
--- a/app/assets/javascripts/index/directions/mapquest.js
+++ b/app/assets/javascripts/index/directions/mapquest.js
@@ -3,27 +3,27 @@
 // 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
-    2: 3, // right
-    3: 4, // sharp right
-    4: 5, // reverse
-    5: 6, // sharp left
-    6: 7, // left
-    7: 8, // slight left
-    8: 5, // right U-turn
-    9: 5, // left U-turn
-    10: 2, // right merge
-    11: 8, // left merge
-    12: 2, // right on-ramp
-    13: 8, // left on-ramp
-    14: 2, // right off-ramp
-    15: 8, // left off-ramp
-    16: 2, // right fork
-    17: 8, // left fork
-    18: 1  // straight fork
+    0: 0, // straight
+    1: 1, // slight right
+    2: 2, // right
+    3: 3, // sharp right
+    4: 4, // reverse
+    5: 7, // sharp left
+    6: 6, // left
+    7: 5, // slight left
+    8: 4, // right U-turn
+    9: 4, // left U-turn
+    10: 21, // right merge
+    11: 20, // left merge
+    12: 21, // right on-ramp
+    13: 20, // left on-ramp
+    14: 24, // right off-ramp
+    15: 25, // left off-ramp
+    16: 18, // right fork
+    17: 19, // left fork
+    18: 0  // straight fork
   };
 
   return {
@@ -32,25 +32,31 @@ function MapQuestEngine(id, vehicleParam) {
     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];
-      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) {
-          if (data.info.statuscode != 0)
+          if (data.info.statuscode !== 0)
             return callback(true);
 
+          var i;
           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]));
           }
 
@@ -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;
-          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];
-            if (i == mq.length - 1) {
+            if (i === mq.length - 1) {
               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]);
           }
 
-          callback(null, {
+          callback(false, {
             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);
+}