X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/30a39b35e55e0b83d3261720eecfa94ed769d6e3..ebaae09797d245ad05f1c00c2f8359c8868fe14d:/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 8d01bcd16..11d600316 100644
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -1,41 +1,42 @@
-function GraphHopperEngine(id, vehicleParam) {
+function GraphHopperEngine(id, vehicleType) {
var 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
+ "-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": 14, // finish reached
+ "5": 14, // via reached
+ "6": 10 // roundabout
};
return {
id: id,
- creditline: 'Graphhopper',
+ creditline: "GraphHopper",
draggable: false,
getRoute: function (points, callback) {
- // documentation
- // https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
- var url = "https://graphhopper.com/api/1/route?"
- + vehicleParam
- + "&locale=" + I18n.currentLocale()
- + "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn"
- + "&type=jsonp"
- + "&instructions=true";
-
- for (var i = 0; i < points.length; i++) {
- url += "&point=" + points[i].lat + ',' + points[i].lng;
- }
-
- $.ajax({
- url: url,
- dataType: 'jsonp',
+ // GraphHopper Directions API documentation
+ // https://graphhopper.com/api/1/docs/routing/
+ return $.ajax({
+ url: OSM.GRAPHHOPPER_URL,
+ data: {
+ vehicle: vehicleType,
+ locale: I18n.currentLocale(),
+ key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",
+ elevation: false,
+ instructions: true,
+ turn_costs: vehicleType === "car",
+ point: points.map(function (p) { return p.lat + "," + p.lng; })
+ },
+ traditional: true,
+ 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);
@@ -44,31 +45,41 @@ function GraphHopperEngine(id, vehicleParam) {
var len = path.instructions.length;
for (var i = 0; i < len; i++) {
var instr = path.instructions[i];
- var instrCode = (i === len - 1) ? 15 : GH_INSTR_MAP[instr.sign];
+ var instrCode = (i === len - 1) ? 14 : GH_INSTR_MAP[instr.sign];
var instrText = "" + (i + 1) + ". ";
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?
}
- callback(null, {
+ callback(false, {
line: line,
steps: steps,
distance: path.distance,
- time: path.time / 1000
+ time: path.time / 1000,
+ ascend: path.ascend,
+ descend: path.descend
});
+ },
+ error: function () {
+ callback(true);
}
});
}
};
}
-OSM.Directions.addEngine(GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), false);
-OSM.Directions.addEngine(GraphHopperEngine("graphhopper_foot", "vehicle=foot"), false);
+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);