cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use generic GraphHopper engine

Browse source
This commit is contained in:
Richard Fairhurst 2014-03-08 12:31:06 +00:00
parent 3ddda7319c
commit 7915a22caf
4 changed files with 66 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/routing.js.erb
View file

@ -238,7 +238,7 @@ OSM.Routing=function(map,name,jqSearch) {
// Add all engines
var list=OSM.RoutingEngines.list;
list.sort(function(a,b) { return a.name>b.name; });
list.sort(function(a,b) { return I18n.t(a.name)>I18n.t(b.name); });
var select=r.jqSearch.find('select.routing_engines');
for (var i=0; i<list.length; i++) {
// Set up JSONP callback

63
app/assets/javascripts/routing_engines/graphhopper.js Normal file
View file

@ -0,0 +1,63 @@
GraphHopperEngine = function(vehicleName, vehicleParam, locale) {
this.vehicleName = vehicleName;
this.vehicleParam = vehicleParam;
this.locale = locale;
if (!locale)
this.locale = "en";
};
GraphHopperEngine.prototype.createConfig = function() {
var that = this;
return {
name: "javascripts.directions.engines.graphhopper_"+this.vehicleName.toLowerCase(),
draggable: false,
_hints: {},
getRoute: function(isFinal, points) {
var url = "http://graphhopper.com/routing/api/route?"
+ that.vehicleParam
+ "&locale=" + that.locale;
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.info.routeFound) {
return false;
}
// Draw polyline
var line = L.PolylineUtil.decode(data.route.coordinates);
router.setPolyline(line);
// Assemble instructions
var steps = [];
var instr = data.route.instructions;
for (i = 0; i < instr.descriptions.length; i++) {
var indi = instr.indications[i];
var instrCode = (i == instr.descriptions.length - 1) ? 15 : this.GH_INSTR_MAP[indi];
var instrText = "<b>" + (i + 1) + ".</b> ";
instrText += instr.descriptions[i];
var latlng = instr.latLngs[i];
var distInMeter = instr.distances[i];
steps.push([{lat: latlng[0], lng: latlng[1]}, instrCode, instrText, distInMeter]);
}
router.setItinerary({steps: steps});
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
}
};
};
OSM.RoutingEngines.list.push(new GraphHopperEngine("Bicycle", "vehicle=bike").createConfig());
OSM.RoutingEngines.list.push(new GraphHopperEngine("Foot", "vehicle=foot").createConfig());

49
app/assets/javascripts/routing_engines/graphhopper_bicycle.js
View file

@ -1,49 +0,0 @@
// GraphHopper bicycle engine
OSM.RoutingEngines.list.push({
name: "javascripts.directions.engines.graphhopper_bike",
creditline: 'Directions courtesy of <a href="http://graphhopper.com/routing/" target="_blank">Graphhopper</a>',
draggable: true,
_hints: {},
getRoute: function(isFinal, points) {
var url = "http://graphhopper.com/routing/api/route?vehicle=bike&locale=" + I18n.currentLocale();
for (var i = 0; i < points.length; i++) {
var pair = points[i].join(',');
url += "&point=" + pair;
}
if (isFinal)
url += "&instructions=true";
this.requestJSONP(url + "&type=jsonp&callback=");
},
gotRoute: function(router, data) {
if (!data.info.routeFound) {
return false;
}
// Draw polyline
var line = L.PolylineUtil.decode(data.route.coordinates);
router.setPolyline(line);
// Assemble instructions
var steps = [];
var instr = data.route.instructions;
for (i = 0; i < instr.descriptions.length; i++) {
var indi = instr.indications[i];
var instrCode = (i==instr.descriptions.length-1) ? 15 : this.GH_INSTR_MAP[indi];
var instrText = "<b>" + (i + 1) + ".</b> ";
instrText += instr.descriptions[i];
var latlng = instr.latLngs[i];
var distInMeter = instr.distances[i];
steps.push([{lat: latlng[0], lng: latlng[1]}, instrCode, instrText, distInMeter]);
}
router.setItinerary({steps: steps});
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
}
});

3
config/locales/en.yml
View file

@ -2120,7 +2120,8 @@ en:
edit_help: Move the map and zoom in on a location you want to edit, then click here.
directions:
engines:
graphhopper_bike: "Bicycle (GraphHopper)"
graphhopper_bicycle: "Bicycle (GraphHopper)"
graphhopper_foot: "Foot (GraphHopper)"
mapquest_bike: "Bicycle (MapQuest)"
osrm_car: "Car (OSRM)"
cloudmade_foot: "Foot (Cloudmade)"