Move the MapQuest API key to the configuration file

[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..d667ea4e4f41ef42dd2a0fd421bb042efd40c6f6 100644 (file)
--- a/app/assets/javascripts/index/directions/mapquest.js
+++ b/app/assets/javascripts/index/directions/mapquest.js
@@ -28,13 +28,14 @@ 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 url = document.location.protocol + "//open.mapquestapi.com/directions/v2/route";

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

+      url += "?key=" + OSM.MAPQUEST_KEY;

       url += "&from=" + from.lat + ',' + from.lng;
       url += "&to=" + to.lat + ',' + to.lng;
       url += "&" + vehicleParam;
       url += "&from=" + from.lat + ',' + from.lng;
       url += "&to=" + to.lat + ',' + to.lng;
       url += "&" + vehicleParam;


@@ -42,15 +43,16 @@ function MapQuestEngine(id, vehicleParam) {
       url += "&manMaps=false";
       url += "&shapeFormat=raw&generalize=0&unit=k";
 
       url += "&manMaps=false";
       url += "&shapeFormat=raw&generalize=0&unit=k";
 

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

         url: url,
         success: function (data) {
         url: url,
         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 +60,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 {


@@ -81,7 +83,7 @@ function MapQuestEngine(id, vehicleParam) {
             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

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


@@ -89,6 +91,8 @@ function MapQuestEngine(id, vehicleParam) {
   };
 }
 
   };
 }
 

-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", "routeType=bicycle"), true);
+  OSM.Directions.addEngine(new MapQuestEngine("mapquest_foot", "routeType=pedestrian"), true);
+  OSM.Directions.addEngine(new MapQuestEngine("mapquest_car", "routeType=fastest"), true);
+}