Conform to project style conventions
This commit is contained in:
John Firebaugh
parent
14086728a6
commit
ed75d4710b
4 changed files with 534 additions and 464 deletions
|
|
@ -1,71 +1,80 @@
|
|||
GraphHopperEngine = function(vehicleName, vehicleParam, locale) {
|
||||
this.vehicleName = vehicleName;
|
||||
this.vehicleParam = vehicleParam;
|
||||
//At this point the local system isn't correctly initialised yet, so we don't have accurate information about current locale
|
||||
this.locale = locale;
|
||||
if (!locale)
|
||||
this.locale = "en";
|
||||
GraphHopperEngine = function (vehicleName, vehicleParam, locale) {
|
||||
this.vehicleName = vehicleName;
|
||||
this.vehicleParam = vehicleParam;
|
||||
//At this point the local system isn't correctly initialised yet, so we don't have accurate information about current locale
|
||||
this.locale = locale;
|
||||
if (!locale)
|
||||
this.locale = "en";
|
||||
};
|
||||
|
||||
GraphHopperEngine.prototype.createConfig = function() {
|
||||
var that = this;
|
||||
return {
|
||||
name: "javascripts.directions.engines.graphhopper_"+this.vehicleName.toLowerCase(),
|
||||
creditline: '<a href="http://graphhopper.com/" target="_blank">Graphhopper</a>',
|
||||
draggable: false,
|
||||
_hints: {},
|
||||
getRoute: function(isFinal, points) {
|
||||
// documentation
|
||||
// https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
|
||||
var url = "http://graphhopper.com/api/1/route?"
|
||||
+ that.vehicleParam
|
||||
+ "&locale=" + I18n.currentLocale()
|
||||
+ "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn";
|
||||
|
||||
for (var i = 0; i < points.length; i++) {
|
||||
var pair = points[i].join(',');
|
||||
url += "&point=" + pair;
|
||||
}
|
||||
if (isFinal)
|
||||
url += "&instructions=true";
|
||||
// GraphHopper supports json too
|
||||
this.requestJSONP(url + "&type=jsonp&callback=");
|
||||
},
|
||||
gotRoute: function(router, data) {
|
||||
if (!data.paths || data.paths.length == 0)
|
||||
return false;
|
||||
|
||||
// Draw polyline
|
||||
var path = data.paths[0];
|
||||
var line = L.PolylineUtil.decode(path.points);
|
||||
router.setPolyline(line);
|
||||
// Assemble instructions
|
||||
var steps = [];
|
||||
var len = path.instructions.length;
|
||||
for (i = 0; i < len; i++) {
|
||||
var instr = path.instructions[i];
|
||||
var instrCode = (i === len - 1) ? 15 : this.GH_INSTR_MAP[instr.sign];
|
||||
var instrText = "<b>" + (i + 1) + ".</b> ";
|
||||
instrText += instr.text;
|
||||
var latLng = line[instr.interval[0]];
|
||||
var distInMeter = instr.distance;
|
||||
steps.push([{lat: latLng.lat, lng: latLng.lng}, instrCode, instrText, distInMeter, []]); // TODO does graphhopper map instructions onto line indices?
|
||||
}
|
||||
router.setItinerary({ steps: steps, distance: path.distance, time: path.time / 1000 });
|
||||
return true;
|
||||
},
|
||||
GH_INSTR_MAP: {
|
||||
"-3": 6, // sharp left
|
||||
"-2": 7, // left
|
||||
"-1": 8, // slight left
|
||||
0: 0, // straight
|
||||
1: 1, // slight right
|
||||
2: 2, // right
|
||||
3: 3, // sharp right
|
||||
4: -1, // finish reached
|
||||
5: -1 // via reached
|
||||
}
|
||||
};
|
||||
GraphHopperEngine.prototype.createConfig = function () {
|
||||
var that = this;
|
||||
return {
|
||||
name: "javascripts.directions.engines.graphhopper_" + this.vehicleName.toLowerCase(),
|
||||
creditline: '<a href="http://graphhopper.com/" target="_blank">Graphhopper</a>',
|
||||
draggable: false,
|
||||
_hints: {},
|
||||
|
||||
getRoute: function (isFinal, points) {
|
||||
// documentation
|
||||
// https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
|
||||
var url = "http://graphhopper.com/api/1/route?"
|
||||
+ that.vehicleParam
|
||||
+ "&locale=" + I18n.currentLocale()
|
||||
+ "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn";
|
||||
|
||||
for (var i = 0; i < points.length; i++) {
|
||||
var pair = points[i].join(',');
|
||||
url += "&point=" + pair;
|
||||
}
|
||||
if (isFinal)
|
||||
url += "&instructions=true";
|
||||
// GraphHopper supports json too
|
||||
this.requestJSONP(url + "&type=jsonp&callback=");
|
||||
},
|
||||
|
||||
gotRoute: function (router, data) {
|
||||
if (!data.paths || data.paths.length == 0)
|
||||
return false;
|
||||
|
||||
// Draw polyline
|
||||
var path = data.paths[0];
|
||||
var line = L.PolylineUtil.decode(path.points);
|
||||
router.setPolyline(line);
|
||||
// Assemble instructions
|
||||
var steps = [];
|
||||
var len = path.instructions.length;
|
||||
for (i = 0; i < len; i++) {
|
||||
var instr = path.instructions[i];
|
||||
var instrCode = (i === len - 1) ? 15 : this.GH_INSTR_MAP[instr.sign];
|
||||
var instrText = "<b>" + (i + 1) + ".</b> ";
|
||||
instrText += instr.text;
|
||||
var latLng = line[instr.interval[0]];
|
||||
var distInMeter = instr.distance;
|
||||
steps.push([
|
||||
{lat: latLng.lat, lng: latLng.lng},
|
||||
instrCode,
|
||||
instrText,
|
||||
distInMeter,
|
||||
[]
|
||||
]); // TODO does graphhopper map instructions onto line indices?
|
||||
}
|
||||
router.setItinerary({ steps: steps, distance: path.distance, time: path.time / 1000 });
|
||||
return true;
|
||||
},
|
||||
|
||||
GH_INSTR_MAP: {
|
||||
"-3": 6, // sharp left
|
||||
"-2": 7, // left
|
||||
"-1": 8, // slight left
|
||||
0: 0, // straight
|
||||
1: 1, // slight right
|
||||
2: 2, // right
|
||||
3: 3, // sharp right
|
||||
4: -1, // finish reached
|
||||
5: -1 // via reached
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
OSM.RoutingEngines.add(false, new GraphHopperEngine("Bicycle", "vehicle=bike").createConfig());
|
||||
|
|
|
|||
|
|
@ -3,89 +3,93 @@
|
|||
// 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";
|
||||
MapQuestEngine = function (vehicleName, vehicleParam, locale) {
|
||||
this.vehicleName = vehicleName;
|
||||
this.vehicleParam = vehicleParam;
|
||||
this.locale = locale;
|
||||
if (!locale)
|
||||
this.locale = "en";
|
||||
};
|
||||
|
||||
MapQuestEngine.prototype.createConfig = function() {
|
||||
var that = this;
|
||||
return {
|
||||
name: "javascripts.directions.engines.mapquest_"+this.vehicleName.toLowerCase(),
|
||||
creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',
|
||||
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) {
|
||||
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+="&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;
|
||||
|
||||
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);
|
||||
MapQuestEngine.prototype.createConfig = function () {
|
||||
var that = this;
|
||||
return {
|
||||
name: "javascripts.directions.engines.mapquest_" + this.vehicleName.toLowerCase(),
|
||||
creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',
|
||||
draggable: false,
|
||||
_hints: {},
|
||||
|
||||
// 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]));
|
||||
}
|
||||
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;
|
||||
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) {
|
||||
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+="&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;
|
||||
|
||||
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);
|
||||
|
||||
// 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]));
|
||||
}
|
||||
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.RoutingEngines.add(true, new MapQuestEngine("Bicycle", "routeType=bicycle").createConfig());
|
||||
|
|
|
|||
|
|
@ -1,60 +1,69 @@
|
|||
// OSRM car engine
|
||||
// Doesn't yet support hints
|
||||
|
||||
OSRMEngine = function(vehicleName, baseURL, locale) {
|
||||
this.vehicleName = vehicleName;
|
||||
this.baseURL = baseURL;
|
||||
this.locale = locale;
|
||||
if (!locale)
|
||||
this.locale = "en";
|
||||
OSRMEngine = function (vehicleName, baseURL, locale) {
|
||||
this.vehicleName = vehicleName;
|
||||
this.baseURL = baseURL;
|
||||
this.locale = locale;
|
||||
if (!locale)
|
||||
this.locale = "en";
|
||||
};
|
||||
|
||||
OSRMEngine.prototype.createConfig = function() {
|
||||
var that = this;
|
||||
return {
|
||||
name: "javascripts.directions.engines.osrm_"+this.vehicleName.toLowerCase(),
|
||||
creditline: '<a href="http://project-osrm.org/" target="_blank">OSRM</a>',
|
||||
draggable: true,
|
||||
_hints: {},
|
||||
getRoute: function(isFinal,points) {
|
||||
var url=that.baseURL+"?z=14&output=json";
|
||||
for (var i=0; i<points.length; i++) {
|
||||
var pair=points[i].join(',');
|
||||
url+="&loc="+pair;
|
||||
if (this._hints[pair]) url+= "&hint="+this._hints[pair];
|
||||
}
|
||||
if (isFinal) url+="&instructions=true";
|
||||
this.requestCORS(url);
|
||||
},
|
||||
gotRoute: function(router,data) {
|
||||
if (data.status==207) {
|
||||
return false;
|
||||
}
|
||||
// Draw polyline
|
||||
var line=L.PolylineUtil.decode(data.route_geometry);
|
||||
for (i=0; i<line.length; i++) { line[i].lat/=10; line[i].lng/=10; }
|
||||
router.setPolyline(line);
|
||||
// Assemble instructions
|
||||
var steps=[];
|
||||
for (i=0; i<data.route_instructions.length; i++) {
|
||||
var s=data.route_instructions[i];
|
||||
var linesegend;
|
||||
var instCodes=s[0].split('-');
|
||||
var instText="<b>"+(i+1)+".</b> ";
|
||||
instText+=TURN_INSTRUCTIONS[instCodes[0]];
|
||||
if (instCodes[1]) { instText+="exit "+instCodes[1]+" "; }
|
||||
if (instCodes[0]!=15) { instText+=s[1] ? "<b>"+s[1]+"</b>" : I18n.t('javascripts.directions.instructions.unnamed'); }
|
||||
if ((i+1)<data.route_instructions.length) {
|
||||
linesegend = data.route_instructions[i+1][3] + 1;
|
||||
} else {
|
||||
linesegend = s[3] + 1;
|
||||
}
|
||||
steps.push([line[s[3]], s[0].split('-')[0], instText, s[2], line.slice(s[3], linesegend)]);
|
||||
}
|
||||
if (steps.length) router.setItinerary({ steps: steps, distance: data.route_summary.total_distance, time: data.route_summary.total_time });
|
||||
return true;
|
||||
OSRMEngine.prototype.createConfig = function () {
|
||||
var that = this;
|
||||
return {
|
||||
name: "javascripts.directions.engines.osrm_" + this.vehicleName.toLowerCase(),
|
||||
creditline: '<a href="http://project-osrm.org/" target="_blank">OSRM</a>',
|
||||
draggable: true,
|
||||
_hints: {},
|
||||
|
||||
getRoute: function (isFinal, points) {
|
||||
var url = that.baseURL + "?z=14&output=json";
|
||||
for (var i = 0; i < points.length; i++) {
|
||||
var pair = points[i].join(',');
|
||||
url += "&loc=" + pair;
|
||||
if (this._hints[pair]) url += "&hint=" + this._hints[pair];
|
||||
}
|
||||
if (isFinal) url += "&instructions=true";
|
||||
this.requestCORS(url);
|
||||
},
|
||||
|
||||
gotRoute: function (router, data) {
|
||||
if (data.status == 207) {
|
||||
return false;
|
||||
}
|
||||
// Draw polyline
|
||||
var line = L.PolylineUtil.decode(data.route_geometry);
|
||||
for (i = 0; i < line.length; i++) {
|
||||
line[i].lat /= 10;
|
||||
line[i].lng /= 10;
|
||||
}
|
||||
router.setPolyline(line);
|
||||
// Assemble instructions
|
||||
var steps = [];
|
||||
for (i = 0; i < data.route_instructions.length; i++) {
|
||||
var s = data.route_instructions[i];
|
||||
var linesegend;
|
||||
var instCodes = s[0].split('-');
|
||||
var instText = "<b>" + (i + 1) + ".</b> ";
|
||||
instText += TURN_INSTRUCTIONS[instCodes[0]];
|
||||
if (instCodes[1]) {
|
||||
instText += "exit " + instCodes[1] + " ";
|
||||
}
|
||||
};
|
||||
if (instCodes[0] != 15) {
|
||||
instText += s[1] ? "<b>" + s[1] + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
|
||||
}
|
||||
if ((i + 1) < data.route_instructions.length) {
|
||||
linesegend = data.route_instructions[i + 1][3] + 1;
|
||||
} else {
|
||||
linesegend = s[3] + 1;
|
||||
}
|
||||
steps.push([line[s[3]], s[0].split('-')[0], instText, s[2], line.slice(s[3], linesegend)]);
|
||||
}
|
||||
if (steps.length) router.setItinerary({ steps: steps, distance: data.route_summary.total_distance, time: data.route_summary.total_time });
|
||||
return true;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
OSM.RoutingEngines.add(false, new OSRMEngine("Car", "http://router.project-osrm.org/viaroute").createConfig());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue