X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/311acad0c43401fe3d7651d021154af2efbedff5..f65593651f17f1bb2caa6a757ca377c094ea7a02:/app/assets/javascripts/index/directions/graphhopper.js?ds=sidebyside
diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js
index 9cf1dc1aa..e72f6d75f 100644
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -3,39 +3,45 @@ function GraphHopperEngine(id, vehicleType) {
"-3": 7, // sharp left
"-2": 6, // left
"-1": 5, // slight left
- 0: 0, // straight
- 1: 1, // slight right
- 2: 2, // right
- 3: 3, // sharp right
- 4: 8, // finish reached
- 5: 8, // via reached
- 6: 10 // roundabout
+ "0": 0, // straight
+ "1": 1, // slight right
+ "2": 2, // right
+ "3": 3, // sharp right
+ "4": 14, // finish reached
+ "5": 14, // via reached
+ "6": 10, // roundabout
+ "-7": 19, // keep left
+ "7": 18, // keep right
+ "-98": 4, // unknown direction u-turn
+ "-8": 4, // left u-turn
+ "8": 4 // right u-turn
};
return {
id: id,
- creditline: 'Graphhopper',
+ creditline: "GraphHopper",
draggable: false,
getRoute: function (points, callback) {
// GraphHopper Directions API documentation
- // https://github.com/graphhopper/directions-api/blob/master/docs-routing.md
+ // https://graphhopper.com/api/1/docs/routing/
return $.ajax({
- url: document.location.protocol + OSM.GRAPHHOPPER_URL,
+ url: OSM.GRAPHHOPPER_URL,
data: {
vehicle: vehicleType,
locale: I18n.currentLocale(),
key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",
- type: "jsonp",
elevation: false,
instructions: true,
+ turn_costs: vehicleType === "car",
point: points.map(function (p) { return p.lat + "," + p.lng; })
},
traditional: true,
- dataType: "jsonp",
+ dataType: "json",
success: function (data) {
- if (!data.paths || data.paths.length === 0)
+ if (!data.paths || data.paths.length === 0) {
return callback(true);
+ }
var path = data.paths[0];
var line = L.PolylineUtil.decode(path.points);
@@ -49,12 +55,16 @@ function GraphHopperEngine(id, vehicleType) {
instrText += instr.text;
var latLng = line[instr.interval[0]];
var distInMeter = instr.distance;
+ var lineseg = [];
+ for (var j = instr.interval[0]; j <= instr.interval[1]; j++) {
+ lineseg.push({ lat: line[j][0], lng: line[j][1] });
+ }
steps.push([
- {lat: latLng.lat, lng: latLng.lng},
+ { lat: latLng[0], lng: latLng[1] },
instrCode,
instrText,
distInMeter,
- []
+ lineseg
]); // TODO does graphhopper map instructions onto line indices?
}
@@ -62,7 +72,9 @@ function GraphHopperEngine(id, vehicleType) {
line: line,
steps: steps,
distance: path.distance,
- time: path.time / 1000
+ time: path.time / 1000,
+ ascend: path.ascend,
+ descend: path.descend
});
},
error: function () {
@@ -73,5 +85,6 @@ function GraphHopperEngine(id, vehicleType) {
};
}
+OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_car", "car"), true);
OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_bicycle", "bike"), true);
OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_foot", "foot"), true);