Combine category and reporting user

[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 fbfed21cf0a92f571e6a191a2715c869c5fbb594..739ce65395c71afa6c79eca946dbf3e83d83b3de 100644 (file)
--- a/app/assets/javascripts/index/directions/mapquest.js
+++ b/app/assets/javascripts/index/directions/mapquest.js
@@ -1,6 +1,6 @@
 // For docs, see:
 // For docs, see:

-// http://developer.mapquest.com/web/products/open/directions-service
-// http://open.mapquestapi.com/directions/
+// https://developer.mapquest.com/web/products/open/directions-service
+// https://open.mapquestapi.com/directions/

 // https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153
 
 function MapQuestEngine(id, routeType) {
 // https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153
 
 function MapQuestEngine(id, routeType) {


@@ -10,15 +10,15 @@ function MapQuestEngine(id, routeType) {
     2: 2, // right
     3: 3, // sharp right
     4: 4, // reverse
     2: 2, // right
     3: 3, // sharp right
     4: 4, // reverse

-    5: 5, // sharp left
+    5: 7, // sharp left

     6: 6, // left
     6: 6, // left

-    7: 7, // slight left
-    8: 3, // right U-turn (mapped to shard-right symbol)
-    9: 8, // left U-turn
+    7: 5, // slight left
+    8: 4, // right U-turn
+    9: 4, // left U-turn

     10: 21, // right merge
     11: 20, // left merge
     10: 21, // right merge
     11: 20, // left merge

-    12: 2, // right on-ramp
-    13: 6, // left on-ramp
+    12: 21, // right on-ramp
+    13: 20, // left on-ramp

     14: 24, // right off-ramp
     15: 25, // left off-ramp
     16: 18, // right fork
     14: 24, // right off-ramp
     15: 25, // left off-ramp
     16: 18, // right fork


@@ -28,7 +28,7 @@ function MapQuestEngine(id, routeType) {
 
   return {
     id: id,
 
   return {
     id: id,

-    creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="' + document.location.protocol + '//developer.mapquest.com/content/osm/mq_logo.png">',
+    creditline: '<a href="https://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) {


@@ -36,7 +36,7 @@ function MapQuestEngine(id, routeType) {
       var to = points[points.length - 1];
 
       return $.ajax({
       var to = points[points.length - 1];
 
       return $.ajax({

-        url: document.location.protocol + OSM.MAPQUEST_DIRECTIONS_URL,
+        url: OSM.MAPQUEST_DIRECTIONS_URL,

         data: {
           key: OSM.MAPQUEST_KEY,
           from: from.lat + "," + from.lng,
         data: {
           key: OSM.MAPQUEST_KEY,
           from: from.lat + "," + from.lng,