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

changed check to make sure parameters exist

Browse Source
This commit is contained in:
DennisSchiefer 2012-07-05 09:45:54 +01:00
parent 4ebe4848af
commit 8b17e4864e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
WebContent/routing/OSRM.Routing.js
View File

@ -57,7 +57,7 @@ timeoutRoute_Reversed: function() {
showRoute: function(response, parameters) { showRoute: function(response, parameters) {
if(!response) if(!response)
return; return;
if(!parameters || parameters.keepAlternative == false) if( parameters.keepAlternative == false )
OSRM.G.active_alternative = 0; OSRM.G.active_alternative = 0;
OSRM.G.response = response; // needed for printing & history routes! OSRM.G.response = response; // needed for printing & history routes!
@ -74,7 +74,7 @@ showRoute: function(response, parameters) {
OSRM.Routing._snapRoute(); OSRM.Routing._snapRoute();
} }
OSRM.Routing._updateHints(response); OSRM.Routing._updateHints(response);
if( parameters && parameters.recenter == true ) { // allow recentering when the route is first shown if( parameters.recenter == true ) { // allow recentering when the route is first shown
var bounds = new L.LatLngBounds( OSRM.G.route._current_route.getPositions() ); var bounds = new L.LatLngBounds( OSRM.G.route._current_route.getPositions() );
OSRM.G.map.setViewBoundsUI(bounds); OSRM.G.map.setViewBoundsUI(bounds);
} }
@ -101,7 +101,7 @@ showRoute_Dragging: function(response) {
showRoute_Redraw: function(response, parameters) { showRoute_Redraw: function(response, parameters) {
if(!response) if(!response)
return; return;
if(!parameters || parameters.keepAlternative == false) if( parameters.keepAlternative == false )
OSRM.G.active_alternative = 0; OSRM.G.active_alternative = 0;
OSRM.G.response = response; // not needed, even harmful as important information is not stored! ==> really ???? OSRM.G.response = response; // not needed, even harmful as important information is not stored! ==> really ????
@ -118,12 +118,14 @@ showRoute_Redraw: function(response, parameters) {
//generate server calls to query routes //generate server calls to query routes
getRoute: function(parameters) { getRoute: function(parameters) {
// if source or target are not set -> hide route // if source or target are not set -> hide route
if( OSRM.G.markers.route.length < 2 ) { if( OSRM.G.markers.route.length < 2 ) {
OSRM.G.route.hideRoute(); OSRM.G.route.hideRoute();
return; return;
} }
parameters = parameters || {};
OSRM.JSONP.clear('dragging'); OSRM.JSONP.clear('dragging');
OSRM.JSONP.clear('redraw'); OSRM.JSONP.clear('redraw');
OSRM.JSONP.clear('route'); OSRM.JSONP.clear('route');
@ -142,6 +144,8 @@ getRoute_Redraw: function(parameters) {
if( OSRM.G.markers.route.length < 2 ) if( OSRM.G.markers.route.length < 2 )
return; return;
parameters = parameters || {};
OSRM.JSONP.clear('dragging'); OSRM.JSONP.clear('dragging');
OSRM.JSONP.clear('redraw'); OSRM.JSONP.clear('redraw');
OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=true', OSRM.Routing.showRoute_Redraw, OSRM.Routing.timeoutRoute, OSRM.DEFAULTS.JSONP_TIMEOUT, 'redraw',parameters); OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=true', OSRM.Routing.showRoute_Redraw, OSRM.Routing.timeoutRoute, OSRM.DEFAULTS.JSONP_TIMEOUT, 'redraw',parameters);