cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Conform to project style conventions

Browse source
This commit is contained in:
John Firebaugh 2014-05-12 12:32:32 -07:00
parent 14086728a6
commit ed75d4710b
4 changed files with 534 additions and 464 deletions
Download patch file Download diff file Expand all files Collapse all files

330
app/assets/javascripts/routing.js.erb
View file

@ -2,32 +2,32 @@
osm.org routing interface osm.org routing interface
*/ */
var TURN_INSTRUCTIONS=[] var TURN_INSTRUCTIONS = [];
var ROUTING_POLYLINE={ var ROUTING_POLYLINE = {
color: '#03f', color: '#03f',
opacity: 0.3, opacity: 0.3,
weight: 10 weight: 10
}; };
var ROUTING_POLYLINE_HIGHLIGHT={ var ROUTING_POLYLINE_HIGHLIGHT = {
color: '#ff0', color: '#ff0',
opacity: 0.5, opacity: 0.5,
weight: 12 weight: 12
}; };
OSM.RoutingEngines = {
OSM.RoutingEngines={
list: [], list: [],
add: function(supportsHTTPS,engine) { add: function (supportsHTTPS, engine) {
if (document.location.protocol=="http:" || supportsHTTPS) this.list.push(engine); if (document.location.protocol == "http:" || supportsHTTPS) this.list.push(engine);
} }
}; };
OSM.Routing=function(map,name,jqSearch) { OSM.Routing = function (map, name, jqSearch) {
var r={}; var r = {};
TURN_INSTRUCTIONS=["", TURN_INSTRUCTIONS = [
"",
I18n.t('javascripts.directions.instructions.continue_on'), // 1 I18n.t('javascripts.directions.instructions.continue_on'), // 1
I18n.t('javascripts.directions.instructions.slight_right'), // 2 I18n.t('javascripts.directions.instructions.slight_right'), // 2
I18n.t('javascripts.directions.instructions.turn_right'), // 3 I18n.t('javascripts.directions.instructions.turn_right'), // 3
@ -44,25 +44,26 @@ OSM.Routing=function(map,name,jqSearch) {
I18n.t('javascripts.directions.instructions.start'), // 14 I18n.t('javascripts.directions.instructions.start'), // 14
I18n.t('javascripts.directions.instructions.destination'), // 15 I18n.t('javascripts.directions.instructions.destination'), // 15
I18n.t('javascripts.directions.instructions.against_oneway'), // 16 I18n.t('javascripts.directions.instructions.against_oneway'), // 16
I18n.t('javascripts.directions.instructions.end_oneway')] // 17 I18n.t('javascripts.directions.instructions.end_oneway') // 17
];
r.map=map; // Leaflet map r.map = map; // Leaflet map
r.name=name; // global variable name of this instance (needed for JSONP) r.name = name; // global variable name of this instance (needed for JSONP)
r.jqSearch=jqSearch; // JQuery object for search panel r.jqSearch = jqSearch; // JQuery object for search panel
r.route_from=null; // null=unset, false=awaiting response, [lat,lon]=geocoded r.route_from = null; // null=unset, false=awaiting response, [lat,lon]=geocoded
r.route_to=null; // | r.route_to = null; // |
r.awaitingGeocode=false;// true if the user has requested a route, but we're waiting on a geocode result r.awaitingGeocode = false;// true if the user has requested a route, but we're waiting on a geocode result
r.awaitingRoute=false; // true if we've asked the engine for a route and are waiting to hear back r.awaitingRoute = false; // true if we've asked the engine for a route and are waiting to hear back
r.dragging=false; // true if the user is dragging a start/end point r.dragging = false; // true if the user is dragging a start/end point
r.viaPoints=[]; // not yet used r.viaPoints = []; // not yet used
r.polyline=null; // Leaflet polyline object r.polyline = null; // Leaflet polyline object
r.popup=null; // Leaflet popup object r.popup = null; // Leaflet popup object
r.marker_from=null; // Leaflet from marker r.marker_from = null; // Leaflet from marker
r.marker_to=null; // Leaflet to marker r.marker_to = null; // Leaflet to marker
r.chosenEngine=null; // currently selected routing engine r.chosenEngine = null; // currently selected routing engine
var icon_from = L.icon({ var icon_from = L.icon({
iconUrl: <%= asset_path('marker-green.png').to_json %>, iconUrl: <%= asset_path('marker-green.png').to_json %>,
@ -72,6 +73,7 @@ OSM.Routing=function(map,name,jqSearch) {
shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>, shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
shadowSize: [41, 41] shadowSize: [41, 41]
}); });
var icon_to = L.icon({ var icon_to = L.icon({
iconUrl: <%= asset_path('marker-red.png').to_json %>, iconUrl: <%= asset_path('marker-red.png').to_json %>,
iconSize: [25, 41], iconSize: [25, 41],
@ -83,223 +85,269 @@ OSM.Routing=function(map,name,jqSearch) {
// Geocoding // Geocoding
r.geocode=function(id,event) { var _this=this; r.geocode = function (id, event) {
var field=event.target; var _this = this;
var v=event.target.value; var field = event.target;
var v = event.target.value;
var querystring = '<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(v) + '&format=json'; var querystring = '<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(v) + '&format=json';
// *** &accept-language=<%#= request.user_preferred_languages.join(',') %> // *** &accept-language=<%#= request.user_preferred_languages.join(',') %>
r[field.id]=false; r[field.id] = false;
$.getJSON(querystring, function(json) { _this._gotGeocode(json,field); }); $.getJSON(querystring, function (json) {
_this._gotGeocode(json, field);
});
}; };
r._gotGeocode=function(json,field) { r._gotGeocode = function (json, field) {
if (json.length==0) { if (json.length == 0) {
alert(I18n.t('javascripts.directions.errors.no_place')); alert(I18n.t('javascripts.directions.errors.no_place'));
r[field.id]=null; r[field.id] = null;
return; return;
} }
field.value=json[0].display_name; field.value = json[0].display_name;
var lat=Number(json[0].lat), lon=Number(json[0].lon); var lat = Number(json[0].lat), lon = Number(json[0].lon);
r[field.id]=[lat,lon]; r[field.id] = [lat, lon];
r.updateMarker(field.id); r.updateMarker(field.id);
if (r.awaitingGeocode) { if (r.awaitingGeocode) {
r.awaitingGeocode=false; r.awaitingGeocode = false;
r.requestRoute(true, true); r.requestRoute(true, true);
} }
}; };
// Drag and drop markers // Drag and drop markers
r.handleDrop=function(e) { r.handleDrop = function (e) {
var oe=e.originalEvent; var oe = e.originalEvent;
var id=oe.dataTransfer.getData('id'); var id = oe.dataTransfer.getData('id');
var pt=L.DomEvent.getMousePosition(oe,map.getContainer()); // co-ordinates of the mouse pointer at present var pt = L.DomEvent.getMousePosition(oe, map.getContainer()); // co-ordinates of the mouse pointer at present
pt.x+=Number(oe.dataTransfer.getData('offsetX')); pt.x += Number(oe.dataTransfer.getData('offsetX'));
pt.y+=Number(oe.dataTransfer.getData('offsetY')); pt.y += Number(oe.dataTransfer.getData('offsetY'));
var ll=map.containerPointToLatLng(pt); var ll = map.containerPointToLatLng(pt);
r.createMarker(ll,id); r.createMarker(ll, id);
r.setNumericInput(ll,id); r.setNumericInput(ll, id);
r.requestRoute(true, false); r.requestRoute(true, false);
// update to/from field // update to/from field
}; };
r.createMarker=function(latlng,id) {
r.createMarker = function (latlng, id) {
if (r[id]) r.map.removeLayer(r[id]); if (r[id]) r.map.removeLayer(r[id]);
r[id]=L.marker(latlng, { r[id] = L.marker(latlng, {
icon: id=='marker_from' ? icon_from : icon_to, icon: id == 'marker_from' ? icon_from : icon_to,
draggable: true, draggable: true,
name: id name: id
}).addTo(r.map); }).addTo(r.map);
r[id].on('drag',r.markerDragged); r[id].on('drag', r.markerDragged);
r[id].on('dragend',r.markerDragged); r[id].on('dragend', r.markerDragged);
}; };
// Update marker from geocoded route input // Update marker from geocoded route input
r.updateMarker=function(id) { r.updateMarker = function (id) {
var m=id.replace('route','marker'); var m = id.replace('route', 'marker');
if (!r[m]) { r.createMarker(r[id],m); return; } if (!r[m]) {
var ll=r[m].getLatLng(); r.createMarker(r[id], m);
if (ll.lat!=r[id][0] || ll.lng!=r[id][1]) { return;
r.createMarker(r[id],m); }
var ll = r[m].getLatLng();
if (ll.lat != r[id][0] || ll.lng != r[id][1]) {
r.createMarker(r[id], m);
} }
}; };
// Marker has been dragged // Marker has been dragged
r.markerDragged=function(e) { r.markerDragged = function (e) {
r.dragging=(e.type=='drag'); // true for drag, false for dragend r.dragging = (e.type == 'drag'); // true for drag, false for dragend
if (r.dragging && !r.chosenEngine.draggable) return; if (r.dragging && !r.chosenEngine.draggable) return;
if (r.dragging && r.awaitingRoute) return; if (r.dragging && r.awaitingRoute) return;
r.setNumericInput(e.target.getLatLng(), e.target.options.name); r.setNumericInput(e.target.getLatLng(), e.target.options.name);
r.requestRoute(!r.dragging, false); r.requestRoute(!r.dragging, false);
}; };
// Set a route input field to a numeric value // Set a route input field to a numeric value
r.setNumericInput=function(ll,id) { r.setNumericInput = function (ll, id) {
var routeid=id.replace('marker','route'); var routeid = id.replace('marker', 'route');
r[routeid]=[ll.lat,ll.lng]; r[routeid] = [ll.lat, ll.lng];
$("[name="+routeid+"]:visible").val(Math.round(ll.lat*10000)/10000+" "+Math.round(ll.lng*10000)/10000); $("[name=" + routeid + "]:visible").val(Math.round(ll.lat * 10000) / 10000 + " " + Math.round(ll.lng * 10000) / 10000);
} };
// Route-fetching UI // Route-fetching UI
r.requestRoute=function(isFinal, updateZoom) { r.requestRoute = function (isFinal, updateZoom) {
if (r.route_from && r.route_to) { if (r.route_from && r.route_to) {
$(".query_wrapper.routing .spinner").show(); $(".query_wrapper.routing .spinner").show();
r.awaitingRoute=true; r.awaitingRoute = true;
r.chosenEngine.getRoute(isFinal,[r.route_from,r.route_to]); r.chosenEngine.getRoute(isFinal, [r.route_from, r.route_to]);
if(updateZoom){ if (updateZoom) {
r.map.fitBounds(L.latLngBounds([r.route_from, r.route_to]).pad(0.05)); r.map.fitBounds(L.latLngBounds([r.route_from, r.route_to]).pad(0.05));
} }
// then, when the route has been fetched, it'll call the engine's gotRoute function // then, when the route has been fetched, it'll call the engine's gotRoute function
} else if (r.route_from==false || r.route_to==false) { } else if (r.route_from == false || r.route_to == false) {
// we're waiting for a Nominatim response before we can request a route // we're waiting for a Nominatim response before we can request a route
r.awaitingGeocode=true; r.awaitingGeocode = true;
} }
}; };
// Take an array of Leaflet LatLngs and draw it as a polyline // Take an array of Leaflet LatLngs and draw it as a polyline
r.setPolyline=function(line) { r.setPolyline = function (line) {
if (r.polyline) map.removeLayer(r.polyline); if (r.polyline) map.removeLayer(r.polyline);
r.polyline=L.polyline(line, ROUTING_POLYLINE).addTo(r.map); r.polyline = L.polyline(line, ROUTING_POLYLINE).addTo(r.map);
}; };
// Take directions and write them out // Take directions and write them out
// data = { steps: array of [latlng, sprite number, instruction text, distance in metres, highlightPolyline] } // data = { steps: array of [latlng, sprite number, instruction text, distance in metres, highlightPolyline] }
// sprite numbers equate to OSRM's route_instructions turn values // sprite numbers equate to OSRM's route_instructions turn values
r.setItinerary=function(data) { r.setItinerary = function (data) {
// Create base table // Create base table
$("#content").removeClass("overlay-sidebar"); $("#content").removeClass("overlay-sidebar");
$('#sidebar_content').empty(); $('#sidebar_content').empty();
var html=('<h2><a class="geolink" href="#" onclick="$(~.close_directions~).click();return false;">' + var html = ('<h2><a class="geolink" href="#" onclick="$(~.close_directions~).click();return false;">' +
'<span class="icon close"></span></a>' + I18n.t('javascripts.directions.directions') + '<span class="icon close"></span></a>' + I18n.t('javascripts.directions.directions') +
'</h2><p id="routing_summary">' + '</h2><p id="routing_summary">' +
I18n.t('javascripts.directions.distance') + ': ' + r.formatDistance(data.distance)+ '. ' + I18n.t('javascripts.directions.distance') + ': ' + r.formatDistance(data.distance) + '. ' +
I18n.t('javascripts.directions.time' ) + ': ' + r.formatTime(data.time) + '.</p>' + I18n.t('javascripts.directions.time') + ': ' + r.formatTime(data.time) + '.</p>' +
'<table id="turnbyturn" />').replace(/~/g,"'"); '<table id="turnbyturn" />').replace(/~/g, "'");
$('#sidebar_content').html(html); $('#sidebar_content').html(html);
// Add each row // Add each row
var cumulative=0; var cumulative = 0;
for (var i=0; i<data.steps.length; i++) { for (var i = 0; i < data.steps.length; i++) {
var step=data.steps[i]; var step = data.steps[i];
// Distance // Distance
var dist=step[3]; var dist = step[3];
if (dist<5) { dist=""; } if (dist < 5) {
else if (dist<200) { dist=Math.round(dist/10)*10+"m"; } dist = "";
else if (dist<1500) { dist=Math.round(dist/100)*100+"m"; } }
else if (dist<5000) { dist=Math.round(dist/100)/10+"km"; } else if (dist < 200) {
else { dist=Math.round(dist/1000)+"km"; } dist = Math.round(dist / 10) * 10 + "m";
}
else if (dist < 1500) {
dist = Math.round(dist / 100) * 100 + "m";
}
else if (dist < 5000) {
dist = Math.round(dist / 100) / 10 + "km";
}
else {
dist = Math.round(dist / 1000) + "km";
}
// Add to table // Add to table
var row=$("<tr class='turn'/>"); var row = $("<tr class='turn'/>");
row.append("<td class='direction i"+step[1]+"'> "); row.append("<td class='direction i" + step[1] + "'> ");
row.append("<td class='instruction'>"+step[2]); row.append("<td class='instruction'>" + step[2]);
row.append("<td class='distance'>"+dist); row.append("<td class='distance'>" + dist);
with ({ instruction: step[2], ll: step[0], lineseg: step[4] }) { with ({ instruction: step[2], ll: step[0], lineseg: step[4] }) {
row.on('click',function(e) { r.clickTurn(instruction, ll); }); row.on('click', function (e) {
row.hover(function(e){r.highlightSegment(lineseg);}, function(e){r.unhighlightSegment();}); r.clickTurn(instruction, ll);
}; });
row.hover(function (e) {
r.highlightSegment(lineseg);
}, function (e) {
r.unhighlightSegment();
});
}
;
$('#turnbyturn').append(row); $('#turnbyturn').append(row);
cumulative+=step[3]; cumulative += step[3];
} }
$('#sidebar_content').append('<p id="routing_credit">' + I18n.t('javascripts.directions.instructions.courtesy',{link: r.chosenEngine.creditline}) + '</p>'); $('#sidebar_content').append('<p id="routing_credit">' + I18n.t('javascripts.directions.instructions.courtesy', {link: r.chosenEngine.creditline}) + '</p>');
};
r.clickTurn = function (instruction, latlng) {
r.popup = L.popup().setLatLng(latlng).setContent("<p>" + instruction + "</p>").openOn(r.map);
}; };
r.clickTurn=function(instruction,latlng) {
r.popup=L.popup().setLatLng(latlng).setContent("<p>"+instruction+"</p>").openOn(r.map); r.highlightSegment = function (lineseg) {
};
r.highlightSegment=function(lineseg){
if (r.highlighted) map.removeLayer(r.highlighted); if (r.highlighted) map.removeLayer(r.highlighted);
r.highlighted=L.polyline(lineseg, ROUTING_POLYLINE_HIGHLIGHT).addTo(r.map); r.highlighted = L.polyline(lineseg, ROUTING_POLYLINE_HIGHLIGHT).addTo(r.map);
}
r.unhighlightSegment=function(){
if (r.highlighted) map.removeLayer(r.highlighted);
}
r.formatDistance=function(m) {
if (m < 1000 ) { return Math.round(m) + "m"; }
else if (m < 10000) { return (m/1000.0).toFixed(1) + "km"; }
else { return Math.round(m / 1000) + "km"; }
}; };
r.formatTime=function(s) {
var m=Math.round(s/60); r.unhighlightSegment = function () {
var h=Math.floor(m/60); if (r.highlighted) map.removeLayer(r.highlighted);
m -= h*60; };
return h+":"+(m<10 ? '0' : '')+m;
r.formatDistance = function (m) {
if (m < 1000) {
return Math.round(m) + "m";
}
else if (m < 10000) {
return (m / 1000.0).toFixed(1) + "km";
}
else {
return Math.round(m / 1000) + "km";
}
};
r.formatTime = function (s) {
var m = Math.round(s / 60);
var h = Math.floor(m / 60);
m -= h * 60;
return h + ":" + (m < 10 ? '0' : '') + m;
}; };
// Close all routing UI // Close all routing UI
r.close=function() { r.close = function () {
$("#content").addClass("overlay-sidebar"); $("#content").addClass("overlay-sidebar");
r.route_from=r.route_to=null; r.route_from = r.route_to = null;
$(".query_wrapper.routing input").val(""); $(".query_wrapper.routing input").val("");
var remove=['polyline','popup','marker_from','marker_to']; var remove = ['polyline', 'popup', 'marker_from', 'marker_to'];
for (var i=0; i<remove.length; i++) { for (var i = 0; i < remove.length; i++) {
if (r[remove[i]]) { map.removeLayer(r[remove[i]]); r[remove[i]]=null; } if (r[remove[i]]) {
map.removeLayer(r[remove[i]]);
r[remove[i]] = null;
}
} }
}; };
// Routing engine handling // Routing engine handling
// Add all engines // Add all engines
var list=OSM.RoutingEngines.list; var list = OSM.RoutingEngines.list;
list.sort(function(a,b) { return I18n.t(a.name)>I18n.t(b.name); }); list.sort(function (a, b) {
var select=r.jqSearch.find('select.routing_engines'); return I18n.t(a.name) > I18n.t(b.name);
for (var i=0; i<list.length; i++) { });
var select = r.jqSearch.find('select.routing_engines');
for (var i = 0; i < list.length; i++) {
// Set up JSONP callback // Set up JSONP callback
with ({num: i}) { with ({num: i}) {
list[num].requestJSONP=function(url) { list[num].requestJSONP = function (url) {
var script = document.createElement('script'); var script = document.createElement('script');
script.src = url+r.name+".gotRoute"+num; script.src = url + r.name + ".gotRoute" + num;
document.body.appendChild(script); document.body.appendChild(script);
}; };
list[num].requestCORS=function(url) { list[num].requestCORS = function (url) {
$.ajax({ url: url, method: "GET", data: {}, dataType: 'json', success: r['gotRoute'+num] }); $.ajax({ url: url, method: "GET", data: {}, dataType: 'json', success: r['gotRoute' + num] });
}; };
r['gotRoute'+num]=function(data) { r['gotRoute' + num] = function (data) {
r.awaitingRoute=false; r.awaitingRoute = false;
$(".query_wrapper.routing .spinner").hide(); $(".query_wrapper.routing .spinner").hide();
if (!list[num].gotRoute(r,data)) { if (!list[num].gotRoute(r, data)) {
// No route found // No route found
if (r.polyline) { if (r.polyline) {
map.removeLayer(r.polyline); map.removeLayer(r.polyline);
r.polyline=null; r.polyline = null;
}
if (!r.dragging) {
alert(I18n.t('javascripts.directions.errors.no_route'));
} }
if (!r.dragging) { alert(I18n.t('javascripts.directions.errors.no_route')); }
} }
}; };
} }
select.append("<option value='"+i+"'>"+I18n.t(list[i].name)+"</option>"); select.append("<option value='" + i + "'>" + I18n.t(list[i].name) + "</option>");
} }
r.engines=list;
r.chosenEngine=list[0]; // default to first engine r.engines = list;
r.chosenEngine = list[0]; // default to first engine
// Choose an engine on dropdown change // Choose an engine on dropdown change
r.selectEngine=function(e) { r.selectEngine = function (e) {
r.chosenEngine=r.engines[e.target.selectedIndex]; r.chosenEngine = r.engines[e.target.selectedIndex];
if (r.polyline){ // and if a route is currently showing, must also refresh, else confusion if (r.polyline) { // and if a route is currently showing, must also refresh, else confusion
r.requestRoute(true, false); r.requestRoute(true, false);
} }
}; };
// Choose an engine by name // Choose an engine by name
r.chooseEngine=function(name) { r.chooseEngine = function (name) {
for (var i=0; i<r.engines.length; i++) { for (var i = 0; i < r.engines.length; i++) {
if (r.engines[i].name==name) { if (r.engines[i].name == name) {
r.chosenEngine=r.engines[i]; r.chosenEngine = r.engines[i];
r.jqSearch.find('select.routing_engines').val(i); r.jqSearch.find('select.routing_engines').val(i);
} }
} }

21
app/assets/javascripts/routing_engines/graphhopper.js
View file

@ -1,4 +1,4 @@
GraphHopperEngine = function(vehicleName, vehicleParam, locale) { GraphHopperEngine = function (vehicleName, vehicleParam, locale) {
this.vehicleName = vehicleName; this.vehicleName = vehicleName;
this.vehicleParam = vehicleParam; this.vehicleParam = vehicleParam;
//At this point the local system isn't correctly initialised yet, so we don't have accurate information about current locale //At this point the local system isn't correctly initialised yet, so we don't have accurate information about current locale
@ -7,14 +7,15 @@ GraphHopperEngine = function(vehicleName, vehicleParam, locale) {
this.locale = "en"; this.locale = "en";
}; };
GraphHopperEngine.prototype.createConfig = function() { GraphHopperEngine.prototype.createConfig = function () {
var that = this; var that = this;
return { return {
name: "javascripts.directions.engines.graphhopper_"+this.vehicleName.toLowerCase(), name: "javascripts.directions.engines.graphhopper_" + this.vehicleName.toLowerCase(),
creditline: '<a href="http://graphhopper.com/" target="_blank">Graphhopper</a>', creditline: '<a href="http://graphhopper.com/" target="_blank">Graphhopper</a>',
draggable: false, draggable: false,
_hints: {}, _hints: {},
getRoute: function(isFinal, points) {
getRoute: function (isFinal, points) {
// documentation // documentation
// https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md // https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
var url = "http://graphhopper.com/api/1/route?" var url = "http://graphhopper.com/api/1/route?"
@ -31,7 +32,8 @@ GraphHopperEngine.prototype.createConfig = function() {
// GraphHopper supports json too // GraphHopper supports json too
this.requestJSONP(url + "&type=jsonp&callback="); this.requestJSONP(url + "&type=jsonp&callback=");
}, },
gotRoute: function(router, data) {
gotRoute: function (router, data) {
if (!data.paths || data.paths.length == 0) if (!data.paths || data.paths.length == 0)
return false; return false;
@ -49,11 +51,18 @@ GraphHopperEngine.prototype.createConfig = function() {
instrText += instr.text; instrText += instr.text;
var latLng = line[instr.interval[0]]; var latLng = line[instr.interval[0]];
var distInMeter = instr.distance; var distInMeter = instr.distance;
steps.push([{lat: latLng.lat, lng: latLng.lng}, instrCode, instrText, distInMeter, []]); // TODO does graphhopper map instructions onto line indices? steps.push([
{lat: latLng.lat, lng: latLng.lng},
instrCode,
instrText,
distInMeter,
[]
]); // TODO does graphhopper map instructions onto line indices?
} }
router.setItinerary({ steps: steps, distance: path.distance, time: path.time / 1000 }); router.setItinerary({ steps: steps, distance: path.distance, time: path.time / 1000 });
return true; return true;
}, },
GH_INSTR_MAP: { GH_INSTR_MAP: {
"-3": 6, // sharp left "-3": 6, // sharp left
"-2": 7, // left "-2": 7, // left

58
app/assets/javascripts/routing_engines/mapquest.js
View file

@ -3,7 +3,7 @@
// http://open.mapquestapi.com/directions/ // http://open.mapquestapi.com/directions/
// https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153 // https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153
MapQuestEngine = function(vehicleName, vehicleParam, locale) { MapQuestEngine = function (vehicleName, vehicleParam, locale) {
this.vehicleName = vehicleName; this.vehicleName = vehicleName;
this.vehicleParam = vehicleParam; this.vehicleParam = vehicleParam;
this.locale = locale; this.locale = locale;
@ -11,13 +11,14 @@ MapQuestEngine = function(vehicleName, vehicleParam, locale) {
this.locale = "en"; this.locale = "en";
}; };
MapQuestEngine.prototype.createConfig = function() { MapQuestEngine.prototype.createConfig = function () {
var that = this; var that = this;
return { return {
name: "javascripts.directions.engines.mapquest_"+this.vehicleName.toLowerCase(), name: "javascripts.directions.engines.mapquest_" + this.vehicleName.toLowerCase(),
creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">', creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',
draggable: false, draggable: false,
_hints: {}, _hints: {},
MQ_SPRITE_MAP: { MQ_SPRITE_MAP: {
0: 1, // straight 0: 1, // straight
1: 2, // slight right 1: 2, // slight right
@ -39,50 +40,53 @@ MapQuestEngine.prototype.createConfig = function() {
17: 8, // left fork 17: 8, // left fork
18: 1 // straight fork 18: 1 // straight fork
}, },
getRoute: function(isFinal,points) {
var url=document.location.protocol+"//open.mapquestapi.com/directions/v2/route?key=Fmjtd%7Cluur290anu%2Crl%3Do5-908a0y"; getRoute: function (isFinal, points) {
var from=points[0]; var to=points[points.length-1]; var url = document.location.protocol + "//open.mapquestapi.com/directions/v2/route?key=Fmjtd%7Cluur290anu%2Crl%3Do5-908a0y";
url+="&from="+from.join(','); var from = points[0];
url+="&to="+to.join(','); var to = points[points.length - 1];
url+="&"+that.vehicleParam; url += "&from=" + from.join(',');
url += "&to=" + to.join(',');
url += "&" + that.vehicleParam;
//url+="&locale=" + I18n.currentLocale(); //Doesn't actually work. MapQuest requires full locale e.g. "de_DE", but I18n may only provides language, e.g. "de" //url+="&locale=" + I18n.currentLocale(); //Doesn't actually work. MapQuest requires full locale e.g. "de_DE", but I18n may only provides language, e.g. "de"
url+="&manMaps=false"; url += "&manMaps=false";
url+="&shapeFormat=raw&generalize=0&unit=k"; url += "&shapeFormat=raw&generalize=0&unit=k";
this.requestCORS(url); this.requestCORS(url);
}, },
gotRoute: function(router,data) {
if (data.info.statuscode!=0) return false;
var poly=[]; gotRoute: function (router, data) {
var shape=data.route.shape.shapePoints; if (data.info.statuscode != 0) return false;
for (var i=0; i<shape.length; i+=2) {
poly.push(L.latLng(shape[i],shape[i+1])); var poly = [];
var shape = data.route.shape.shapePoints;
for (var i = 0; i < shape.length; i += 2) {
poly.push(L.latLng(shape[i], shape[i + 1]));
} }
router.setPolyline(poly); router.setPolyline(poly);
// data.route.shape.maneuverIndexes links turns to polyline positions // data.route.shape.maneuverIndexes links turns to polyline positions
// data.route.legs[0].maneuvers is list of turns // data.route.legs[0].maneuvers is list of turns
var steps=[]; var steps = [];
var mq=data.route.legs[0].maneuvers; var mq = data.route.legs[0].maneuvers;
for (var i=0; i<mq.length; i++) { for (var i = 0; i < mq.length; i++) {
var s=mq[i]; var s = mq[i];
var d; var d;
var linesegstart, linesegend, lineseg; var linesegstart, linesegend, lineseg;
linesegstart = data.route.shape.maneuverIndexes[i]; linesegstart = data.route.shape.maneuverIndexes[i];
if (i==mq.length-1) { if (i == mq.length - 1) {
d = 15; d = 15;
linesegend = linesegstart + 1; linesegend = linesegstart + 1;
} else { } else {
d = this.MQ_SPRITE_MAP[s.turnType]; d = this.MQ_SPRITE_MAP[s.turnType];
linesegend = data.route.shape.maneuverIndexes[i+1] + 1; linesegend = data.route.shape.maneuverIndexes[i + 1] + 1;
} }
lineseg = []; lineseg = [];
for (var j=linesegstart; j<linesegend; j++) { for (var j = linesegstart; j < linesegend; j++) {
lineseg.push(L.latLng(data.route.shape.shapePoints[j*2], data.route.shape.shapePoints[j*2+1])); lineseg.push(L.latLng(data.route.shape.shapePoints[j * 2], data.route.shape.shapePoints[j * 2 + 1]));
} }
steps.push([L.latLng(s.startPoint.lat, s.startPoint.lng), d, s.narrative, s.distance*1000, lineseg]); steps.push([L.latLng(s.startPoint.lat, s.startPoint.lng), d, s.narrative, s.distance * 1000, lineseg]);
} }
router.setItinerary( { steps: steps, distance: data.route.distance*1000, time: data.route['time'] }); router.setItinerary({ steps: steps, distance: data.route.distance * 1000, time: data.route['time'] });
return true; return true;
} }
}; };

57
app/assets/javascripts/routing_engines/osrm.js
View file

@ -1,7 +1,7 @@
// OSRM car engine // OSRM car engine
// Doesn't yet support hints // Doesn't yet support hints
OSRMEngine = function(vehicleName, baseURL, locale) { OSRMEngine = function (vehicleName, baseURL, locale) {
this.vehicleName = vehicleName; this.vehicleName = vehicleName;
this.baseURL = baseURL; this.baseURL = baseURL;
this.locale = locale; this.locale = locale;
@ -9,43 +9,52 @@ OSRMEngine = function(vehicleName, baseURL, locale) {
this.locale = "en"; this.locale = "en";
}; };
OSRMEngine.prototype.createConfig = function() { OSRMEngine.prototype.createConfig = function () {
var that = this; var that = this;
return { return {
name: "javascripts.directions.engines.osrm_"+this.vehicleName.toLowerCase(), name: "javascripts.directions.engines.osrm_" + this.vehicleName.toLowerCase(),
creditline: '<a href="http://project-osrm.org/" target="_blank">OSRM</a>', creditline: '<a href="http://project-osrm.org/" target="_blank">OSRM</a>',
draggable: true, draggable: true,
_hints: {}, _hints: {},
getRoute: function(isFinal,points) {
var url=that.baseURL+"?z=14&output=json"; getRoute: function (isFinal, points) {
for (var i=0; i<points.length; i++) { var url = that.baseURL + "?z=14&output=json";
var pair=points[i].join(','); for (var i = 0; i < points.length; i++) {
url+="&loc="+pair; var pair = points[i].join(',');
if (this._hints[pair]) url+= "&hint="+this._hints[pair]; url += "&loc=" + pair;
if (this._hints[pair]) url += "&hint=" + this._hints[pair];
} }
if (isFinal) url+="&instructions=true"; if (isFinal) url += "&instructions=true";
this.requestCORS(url); this.requestCORS(url);
}, },
gotRoute: function(router,data) {
if (data.status==207) { gotRoute: function (router, data) {
if (data.status == 207) {
return false; return false;
} }
// Draw polyline // Draw polyline
var line=L.PolylineUtil.decode(data.route_geometry); var line = L.PolylineUtil.decode(data.route_geometry);
for (i=0; i<line.length; i++) { line[i].lat/=10; line[i].lng/=10; } for (i = 0; i < line.length; i++) {
line[i].lat /= 10;
line[i].lng /= 10;
}
router.setPolyline(line); router.setPolyline(line);
// Assemble instructions // Assemble instructions
var steps=[]; var steps = [];
for (i=0; i<data.route_instructions.length; i++) { for (i = 0; i < data.route_instructions.length; i++) {
var s=data.route_instructions[i]; var s = data.route_instructions[i];
var linesegend; var linesegend;
var instCodes=s[0].split('-'); var instCodes = s[0].split('-');
var instText="<b>"+(i+1)+".</b> "; var instText = "<b>" + (i + 1) + ".</b> ";
instText+=TURN_INSTRUCTIONS[instCodes[0]]; instText += TURN_INSTRUCTIONS[instCodes[0]];
if (instCodes[1]) { instText+="exit "+instCodes[1]+" "; } if (instCodes[1]) {
if (instCodes[0]!=15) { instText+=s[1] ? "<b>"+s[1]+"</b>" : I18n.t('javascripts.directions.instructions.unnamed'); } instText += "exit " + instCodes[1] + " ";
if ((i+1)<data.route_instructions.length) { }
linesegend = data.route_instructions[i+1][3] + 1; if (instCodes[0] != 15) {
instText += s[1] ? "<b>" + s[1] + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
}
if ((i + 1) < data.route_instructions.length) {
linesegend = data.route_instructions[i + 1][3] + 1;
} else { } else {
linesegend = s[3] + 1; linesegend = s[3] + 1;
} }