Move the MapQuest API key to the configuration file
authorTom Hughes <tom@compton.nu>
Mon, 28 Sep 2015 12:42:00 +0000 (13:42 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 28 Sep 2015 12:45:01 +0000 (13:45 +0100)
app/assets/javascripts/index/directions/mapquest.js
app/assets/javascripts/osm.js.erb
config/example.application.yml

index fbbc55a..d667ea4 100644 (file)
@@ -32,9 +32,10 @@ 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 url = document.location.protocol + "//open.mapquestapi.com/directions/v2/route";
       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;
@@ -90,6 +91,8 @@ function MapQuestEngine(id, vehicleParam) {
   };
 }
 
-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);
+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);
+}
index 6afebf8..93faad8 100644 (file)
@@ -10,6 +10,7 @@ OSM = {
   MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>,
   OVERPASS_URL:          <%= OVERPASS_URL.to_json %>,
   NOMINATIM_URL:         <%= NOMINATIM_URL.to_json %>,
+  MAPQUEST_KEY:          <%= MAPQUEST_KEY.to_json %>,
 
   MARKER_GREEN:          <%= image_path("marker-green.png").to_json %>,
   MARKER_RED:            <%= image_path("marker-red.png").to_json %>,
index 7435fea..59980cd 100644 (file)
@@ -98,6 +98,8 @@ defaults: &defaults
   #facebook_auth_secret: ""
   #windowslive_auth_id: ""
   #windowslive_auth_secret: ""
+  # MapQuest authentication details
+  #mapquest_key: ""
 
 development:
   <<: *defaults