X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be79156f43975a90399bb2629684bea6c580f238..bf5f842c23a469cf2098ae7953f1f8cd9534e361:/app/assets/javascripts/index/directions_engines/mapquest.js?ds=sidebyside
diff --git a/app/assets/javascripts/index/directions_engines/mapquest.js b/app/assets/javascripts/index/directions_engines/mapquest.js
index f24d8fab6..935a1ca4c 100644
--- a/app/assets/javascripts/index/directions_engines/mapquest.js
+++ b/app/assets/javascripts/index/directions_engines/mapquest.js
@@ -3,96 +3,92 @@
// http://open.mapquestapi.com/directions/
// https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153
-MapQuestEngine = function (vehicleName, vehicleParam, locale) {
- this.vehicleName = vehicleName;
- this.vehicleParam = vehicleParam;
- this.locale = locale;
- if (!locale)
- this.locale = "en";
-};
+function MapQuestEngine(id, vehicleParam) {
+ 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
+ };
-MapQuestEngine.prototype.createConfig = function () {
- var that = this;
return {
- name: "javascripts.directions.engines.mapquest_" + this.vehicleName.toLowerCase(),
+ id: id,
creditline: 'MapQuest 
',
draggable: false,
- _hints: {},
-
- 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
- },
- getRoute: function (isFinal, points) {
+ 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.join(',');
- url += "&to=" + to.join(',');
- url += "&" + that.vehicleParam;
+ 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";
- this.requestCORS(url);
- },
- gotRoute: function (router, data) {
- if (data.info.statuscode != 0) return false;
+ $.ajax({
+ url: url,
+ success: function (data) {
+ if (data.info.statuscode != 0)
+ return callback(true);
- var poly = [];
- var shape = data.route.shape.shapePoints;
- for (var i = 0; i < shape.length; i += 2) {
- poly.push(L.latLng(shape[i], shape[i + 1]));
- }
- router.setPolyline(poly);
+ var line = [];
+ var shape = data.route.shape.shapePoints;
+ for (var i = 0; i < shape.length; i += 2) {
+ line.push(L.latLng(shape[i], shape[i + 1]));
+ }
- // data.route.shape.maneuverIndexes links turns to polyline positions
- // 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++) {
- var s = mq[i];
- var d;
- var linesegstart, linesegend, lineseg;
- linesegstart = data.route.shape.maneuverIndexes[i];
- if (i == mq.length - 1) {
- d = 15;
- linesegend = linesegstart + 1;
- } else {
- d = this.MQ_SPRITE_MAP[s.turnType];
- linesegend = data.route.shape.maneuverIndexes[i + 1] + 1;
- }
- lineseg = [];
- for (var j = linesegstart; j < linesegend; j++) {
- lineseg.push(L.latLng(data.route.shape.shapePoints[j * 2], data.route.shape.shapePoints[j * 2 + 1]));
+ // data.route.shape.maneuverIndexes links turns to polyline positions
+ // 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++) {
+ var s = mq[i];
+ var d;
+ var linesegstart, linesegend, lineseg;
+ linesegstart = data.route.shape.maneuverIndexes[i];
+ if (i == mq.length - 1) {
+ d = 15;
+ linesegend = linesegstart + 1;
+ } else {
+ d = MQ_SPRITE_MAP[s.turnType];
+ linesegend = data.route.shape.maneuverIndexes[i + 1] + 1;
+ }
+ lineseg = [];
+ for (var j = linesegstart; j < linesegend; j++) {
+ lineseg.push(L.latLng(data.route.shape.shapePoints[j * 2], data.route.shape.shapePoints[j * 2 + 1]));
+ }
+ steps.push([L.latLng(s.startPoint.lat, s.startPoint.lng), d, s.narrative, s.distance * 1000, lineseg]);
+ }
+
+ callback(null, {
+ line: line,
+ steps: steps,
+ distance: data.route.distance * 1000,
+ time: data.route['time']
+ });
}
- steps.push([L.latLng(s.startPoint.lat, s.startPoint.lng), d, s.narrative, s.distance * 1000, lineseg]);
- }
- router.setItinerary({ steps: steps, distance: data.route.distance * 1000, time: data.route['time'] });
- return true;
+ });
}
};
-};
+}
-OSM.DirectionsEngines.add(true, new MapQuestEngine("Bicycle", "routeType=bicycle").createConfig());
-OSM.DirectionsEngines.add(true, new MapQuestEngine("Foot", "routeType=pedestrian").createConfig());
-OSM.DirectionsEngines.add(true, new MapQuestEngine("Car", "routeType=fastest").createConfig());
-// can be: routeType=fastest|shortest|pedestrian|multimodal|bicycle
+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);