X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be79156f43975a90399bb2629684bea6c580f238..904b5129981657c2d0228a27d8bdfc167b42ac27:/app/assets/javascripts/index/directions_engines/osrm.js diff --git a/app/assets/javascripts/index/directions_engines/osrm.js b/app/assets/javascripts/index/directions_engines/osrm.js index ac78699f9..69b78c25e 100644 --- a/app/assets/javascripts/index/directions_engines/osrm.js +++ b/app/assets/javascripts/index/directions_engines/osrm.js @@ -1,69 +1,96 @@ // OSRM car engine // Doesn't yet support hints -OSRMEngine = function (vehicleName, baseURL, locale) { - this.vehicleName = vehicleName; - this.baseURL = baseURL; - this.locale = locale; - if (!locale) - this.locale = "en"; -}; +function OSRMEngine() { + var previousPoints, hintData; -OSRMEngine.prototype.createConfig = function () { - var that = this; return { - name: "javascripts.directions.engines.osrm_" + this.vehicleName.toLowerCase(), + id: "osrm_car", creditline: 'OSRM', draggable: true, - _hints: {}, - getRoute: function (isFinal, points) { - var url = that.baseURL + "?z=14&output=json"; + getRoute: function (points, callback) { + var TURN_INSTRUCTIONS = [ + "", + I18n.t('javascripts.directions.instructions.continue_on'), // 1 + I18n.t('javascripts.directions.instructions.slight_right'), // 2 + I18n.t('javascripts.directions.instructions.turn_right'), // 3 + I18n.t('javascripts.directions.instructions.sharp_right'), // 4 + I18n.t('javascripts.directions.instructions.uturn'), // 5 + I18n.t('javascripts.directions.instructions.sharp_left'), // 6 + I18n.t('javascripts.directions.instructions.turn_left'), // 7 + I18n.t('javascripts.directions.instructions.slight_left'), // 8 + I18n.t('javascripts.directions.instructions.via_point'), // 9 + I18n.t('javascripts.directions.instructions.follow'), // 10 + I18n.t('javascripts.directions.instructions.roundabout'), // 11 + I18n.t('javascripts.directions.instructions.leave_roundabout'), // 12 + I18n.t('javascripts.directions.instructions.stay_roundabout'), // 13 + I18n.t('javascripts.directions.instructions.start'), // 14 + I18n.t('javascripts.directions.instructions.destination'), // 15 + I18n.t('javascripts.directions.instructions.against_oneway'), // 16 + I18n.t('javascripts.directions.instructions.end_oneway') // 17 + ]; + + var url = "http://router.project-osrm.org/viaroute?z=14&output=json&instructions=true"; + for (var i = 0; i < points.length; i++) { - var pair = points[i].join(','); - url += "&loc=" + pair; - if (this._hints[pair]) url += "&hint=" + this._hints[pair]; + url += "&loc=" + points[i].lat + ',' + points[i].lng; + if (hintData && previousPoints && previousPoints[i].equals(points[i])) { + url += "&hint=" + hintData.locations[i]; + } } - if (isFinal) url += "&instructions=true"; - this.requestCORS(url); - }, - gotRoute: function (router, data) { - if (data.status == 207) { - return false; + if (hintData && hintData.checksum) { + url += "&checksum=" + hintData.checksum; } - // Draw polyline - var line = L.PolylineUtil.decode(data.route_geometry); - for (i = 0; i < line.length; i++) { - line[i].lat /= 10; - line[i].lng /= 10; - } - router.setPolyline(line); - // Assemble instructions - var steps = []; - for (i = 0; i < data.route_instructions.length; i++) { - var s = data.route_instructions[i]; - var linesegend; - var instCodes = s[0].split('-'); - var instText = "" + (i + 1) + ". "; - instText += TURN_INSTRUCTIONS[instCodes[0]]; - if (instCodes[1]) { - instText += "exit " + instCodes[1] + " "; - } - if (instCodes[0] != 15) { - instText += s[1] ? "" + s[1] + "" : I18n.t('javascripts.directions.instructions.unnamed'); - } - if ((i + 1) < data.route_instructions.length) { - linesegend = data.route_instructions[i + 1][3] + 1; - } else { - linesegend = s[3] + 1; + + $.ajax({ + url: url, + dataType: 'json', + success: function (data) { + if (data.status == 207) + return callback(true); + + previousPoints = points; + hintData = data.hint_data; + + var line = L.PolylineUtil.decode(data.route_geometry); + for (var i = 0; i < line.length; i++) { + line[i].lat /= 10; + line[i].lng /= 10; + } + + var steps = []; + for (i = 0; i < data.route_instructions.length; i++) { + var s = data.route_instructions[i]; + var linesegend; + var instCodes = s[0].split('-'); + var instText = "" + (i + 1) + ". "; + instText += TURN_INSTRUCTIONS[instCodes[0]]; + if (instCodes[1]) { + instText += "exit " + instCodes[1] + " "; + } + if (instCodes[0] != 15) { + instText += s[1] ? "" + s[1] + "" : I18n.t('javascripts.directions.instructions.unnamed'); + } + if ((i + 1) < data.route_instructions.length) { + linesegend = data.route_instructions[i + 1][3] + 1; + } else { + linesegend = s[3] + 1; + } + steps.push([line[s[3]], s[0].split('-')[0], instText, s[2], line.slice(s[3], linesegend)]); + } + + callback(null, { + line: line, + steps: steps, + distance: data.route_summary.total_distance, + time: data.route_summary.total_time + }); } - steps.push([line[s[3]], s[0].split('-')[0], instText, s[2], line.slice(s[3], linesegend)]); - } - if (steps.length) router.setItinerary({ steps: steps, distance: data.route_summary.total_distance, time: data.route_summary.total_time }); - return true; + }); } }; -}; +} -OSM.DirectionsEngines.add(false, new OSRMEngine("Car", "http://router.project-osrm.org/viaroute").createConfig()); +OSM.Directions.addEngine(OSRMEngine(), false);