X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4254a1f2910d993aed343ea963c59e8ac9ca52c2..21683db838d66d5b14da08dd5fd467fae09515d4:/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 95cb29ab8..2058a4daf 100644 --- a/app/assets/javascripts/index/directions/graphhopper.js +++ b/app/assets/javascripts/index/directions/graphhopper.js @@ -1,40 +1,39 @@ -function GraphHopperEngine(id, vehicleParam) { +function GraphHopperEngine(id, vehicleType) { var GH_INSTR_MAP = { - "-3": 6, // sharp left - "-2": 7, // left - "-1": 8, // slight left + "-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: -1, // finish reached - 5: -1, // via reached - 6: 11 // roundabout + 4: 14, // finish reached + 5: 14, // via reached + 6: 10 // roundabout }; 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 - var url = document.location.protocol + "//graphhopper.com/api/1/route?" + - vehicleParam + - "&locale=" + I18n.currentLocale() + - "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn" + - "&type=jsonp" + - "&elevation=false" + - "&instructions=true"; - - for (var i = 0; i < points.length; i++) { - url += "&point=" + points[i].lat + ',' + points[i].lng; - } - + // https://graphhopper.com/api/1/docs/routing/ return $.ajax({ - url: url, - dataType: 'jsonp', + url: document.location.protocol + OSM.GRAPHHOPPER_URL, + data: { + vehicle: vehicleType, + locale: I18n.currentLocale(), + key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn", + "ch.disable": vehicleType === "car", + type: "jsonp", + elevation: false, + instructions: true, + point: points.map(function (p) { return p.lat + "," + p.lng; }) + }, + traditional: true, + dataType: "jsonp", success: function (data) { if (!data.paths || data.paths.length === 0) return callback(true); @@ -46,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(new GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), true); -OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_foot", "vehicle=foot"), true); +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);