X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/31c80f66463a143c12b3d6e1395a034d11a812ba..cb87f02642d0097ebc067ca1f9371dde274a41e3:/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 24be65de7..fcc47f103 100644 --- a/app/assets/javascripts/index/directions/mapquest.js +++ b/app/assets/javascripts/index/directions/mapquest.js @@ -5,25 +5,25 @@ 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 { @@ -36,7 +36,7 @@ function MapQuestEngine(id, routeType) { var to = points[points.length - 1]; return $.ajax({ - url: document.location.protocol + "//open.mapquestapi.com/directions/v2/route", + url: document.location.protocol + OSM.MAPQUEST_DIRECTIONS_URL, data: { key: OSM.MAPQUEST_KEY, from: from.lat + "," + from.lng, @@ -83,12 +83,15 @@ function MapQuestEngine(id, routeType) { 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 }); + }, + error: function () { + callback(true); } }); }