Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

more alternative stuff

Browse Source
This commit is contained in:
shiin 2012-06-20 23:52:43 +02:00
parent badd48f166
commit 90c48abeaf
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WebContent/routing/OSRM.RoutingAlternatives.js
View File

@ -35,14 +35,15 @@ _buttons: [
// prepare using alternatives // prepare using alternatives
prepare: function(response) { prepare: function(response) {
// store basic information // store basic information
OSRM.G.alternative_count = response.alternative_geometries.length; OSRM.G.alternative_count = response.alternative_geometries.length + 1;
OSRM.G.alternative_active = 0; OSRM.G.alternative_active = 0;
// do nothing if there is no alternative // do nothing if there is no alternative
if( OSRM.G.alternative_count == 0 ) if( OSRM.G.alternative_count == 1 )
return; return;
// move best route to alternative array // move best route to alternative array
console.log("prepare");
var the_response = OSRM.G.response; var the_response = OSRM.G.response;
the_response.alternative_geometries.unshift( response.route_geometry ); the_response.alternative_geometries.unshift( response.route_geometry );
the_response.alternative_instructions.unshift( response.route_instructions ); the_response.alternative_instructions.unshift( response.route_instructions );
@ -86,12 +87,13 @@ _click: function(button_id) {
var the_response = OSRM.G.response; var the_response = OSRM.G.response;
the_response.route_geometry = the_response.alternative_geometries[button_id]; the_response.route_geometry = the_response.alternative_geometries[button_id];
the_response.route_instructions = the_response.alternative_instructions[button_id]; the_response.route_instructions = the_response.alternative_instructions[button_id];
the_response.alternative_summaries = the_response.alternative_summaries[button_id]; the_response.route_summary = the_response.alternative_summaries[button_id];
// show alternative // show alternative
OSRM.RoutingGeometry.show(the_response); OSRM.RoutingGeometry.show(the_response);
OSRM.RoutingNoNames.show(the_response); OSRM.RoutingNoNames.show(the_response);
OSRM.RoutingDescription.show(the_response); OSRM.RoutingDescription.show(the_response);
OSRM.RoutingAlternatives._addGUI();
}, },
_mouseover: function(button_id) { _mouseover: function(button_id) {
console.log("over "+button_id); console.log("over "+button_id);
@ -118,6 +120,8 @@ _addGUI: function() {
var tooltip = OSRM.loc("DISTANCE")+":"+distance+" "+OSRM.loc("DURATION")+":"+time; var tooltip = OSRM.loc("DISTANCE")+":"+distance+" "+OSRM.loc("DURATION")+":"+time;
var data = '<a class="button top-right-button" id="'+buttons[i].id+'" title="'+tooltip+'">'+buttons[i].label+'</a>'; var data = '<a class="button top-right-button" id="'+buttons[i].id+'" title="'+tooltip+'">'+buttons[i].label+'</a>';
document.getElementById('information-box-header').innerHTML = data + document.getElementById('information-box-header').innerHTML; document.getElementById('information-box-header').innerHTML = data + document.getElementById('information-box-header').innerHTML;
}
for(var i=0, size=OSRM.G.alternative_count; i<size; i++) {
document.getElementById(buttons[i].id).onclick = function (button_id) { return function() {OSRM.RoutingAlternatives._click(button_id); }; }(i) ; document.getElementById(buttons[i].id).onclick = function (button_id) { return function() {OSRM.RoutingAlternatives._click(button_id); }; }(i) ;
document.getElementById(buttons[i].id).onmouseover = function (button_id) { return function() {OSRM.RoutingAlternatives._mouseover(button_id); }; } (i); document.getElementById(buttons[i].id).onmouseover = function (button_id) { return function() {OSRM.RoutingAlternatives._mouseover(button_id); }; } (i);
document.getElementById(buttons[i].id).onmouseout = function (button_id) { return function() {OSRM.RoutingAlternatives._mouseout(button_id); }; } (i); document.getElementById(buttons[i].id).onmouseout = function (button_id) { return function() {OSRM.RoutingAlternatives._mouseout(button_id); }; } (i);

9
WebContent/utils/OSRM.Utils.js
View File

@ -30,12 +30,9 @@ toHumanTime: function(seconds){
seconds = seconds%60; seconds = seconds%60;
hours = parseInt(minutes/60); hours = parseInt(minutes/60);
minutes = minutes%60; minutes = minutes%60;
if(hours==0){ if(hours==0 && minutes==0){ return seconds + '&nbsp;' + 's'; }
return minutes + '&nbsp;' + 'min'; else if(hours==0){ return minutes + '&nbsp;' + 'min'; }
} else{ return hours + '&nbsp;' + 'h' + '&nbsp;' + minutes + '&nbsp;' + 'min';}
else{
return hours + '&nbsp;' + 'h' + '&nbsp;' + minutes + '&nbsp;' + 'min';
}
}, },
//human readable distance //human readable distance
setToHumanDistanceFunction: function(type) { setToHumanDistanceFunction: function(type) {