X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..ae00fa84c8f981e909c61ab31b6115bb96e859cc:/app/assets/javascripts/index/directions/graphhopper.js?ds=inline diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js index 2058a4daf..e72f6d75f 100644 --- a/app/assets/javascripts/index/directions/graphhopper.js +++ b/app/assets/javascripts/index/directions/graphhopper.js @@ -3,40 +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: 14, // finish reached - 5: 14, // 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://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", - "ch.disable": vehicleType === "car", - 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); @@ -52,10 +57,10 @@ function GraphHopperEngine(id, vehicleType) { 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]}); + lineseg.push({ lat: line[j][0], lng: line[j][1] }); } steps.push([ - {lat: latLng[0], lng: latLng[1]}, + { lat: latLng[0], lng: latLng[1] }, instrCode, instrText, distInMeter,