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

did some renaming

Browse Source
This commit is contained in:
shiin 2012-05-12 11:33:05 +02:00
parent f90d1db802
commit 1ec7c6ab50
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
WebContent/base/OSRM.Markers.js
View File

@ -98,13 +98,13 @@ reverseMarkers: function() {
// switch positions in nodes // switch positions in nodes
var temp_position = this.route[0].getPosition(); var temp_position = this.route[0].getPosition();
this.route[0].setPosition( this.route[size-1].getPosition() ); this.route[0].setPosition( this.route[size-1].getPosition() );
OSRM.G.markers.route[size-1].setPosition( temp_position ); this.route[size-1].setPosition( temp_position );
// switch nodes in array // switch nodes in array
var temp_node = OSRM.G.markers.route[0]; var temp_node = this.route[0];
OSRM.G.markers.route[0] = OSRM.G.markers.route[size-1]; this.route[0] = this.route[size-1];
OSRM.G.markers.route[size-1] = temp_node; this.route[size-1] = temp_node;
// reverse route // reverse route
OSRM.G.markers.route.reverse(); this.route.reverse();
// clear information (both delete markers stay visible) // clear information (both delete markers stay visible)
document.getElementById('information-box').innerHTML = ""; document.getElementById('information-box').innerHTML = "";
document.getElementById('information-box-header').innerHTML = ""; document.getElementById('information-box-header').innerHTML = "";
@ -123,12 +123,12 @@ reverseMarkers: function() {
}, },
hasSource: function() { hasSource: function() {
if( OSRM.G.markers.route[0] && OSRM.G.markers.route[0].label == OSRM.C.SOURCE_LABEL ) if( this.route[0] && this.route[0].label == OSRM.C.SOURCE_LABEL )
return true; return true;
return false; return false;
}, },
hasTarget: function() { hasTarget: function() {
if( OSRM.G.markers.route[OSRM.G.markers.route.length-1] && OSRM.G.markers.route[OSRM.G.markers.route.length-1].label == OSRM.C.TARGET_LABEL ) if( this.route[this.route.length-1] && this.route[this.route.length-1].label == OSRM.C.TARGET_LABEL )
return true; return true;
return false; return false;
} }

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

@ -31,47 +31,28 @@ OSRM.Routing = {
// init routing data structures // init routing data structures
init: function() { init: function() {
OSRM.G.markers = new OSRM.Markers();
OSRM.G.route = new OSRM.Route(); OSRM.G.route = new OSRM.Route();
OSRM.G.markers = new OSRM.Markers();
}, },
// -- JSONP processing -- // -- JSONP processing --
// process JSONP response of routing server // process JSONP response of routing server
timeoutRouteSimple: function() {
OSRM.RoutingGeometry.showNA();
OSRM.RoutingDescription.showNA( OSRM.loc("TIMED_OUT") );
},
timeoutRoute: function() { timeoutRoute: function() {
OSRM.RoutingGeometry.showNA(); OSRM.RoutingGeometry.showNA();
OSRM.RoutingNoNames.showNA(); OSRM.RoutingNoNames.showNA();
OSRM.RoutingDescription.showNA( OSRM.loc("TIMED_OUT") ); OSRM.RoutingDescription.showNA( OSRM.loc("TIMED_OUT") );
OSRM.Routing._snapRoute(); OSRM.Routing._snapRoute();
}, },
timeoutRouteReverse: function() { timeoutRoute_Dragging: function() {
OSRM.RoutingGeometry.showNA();
OSRM.RoutingDescription.showNA( OSRM.loc("TIMED_OUT") );
},
timeoutRoute_Reversed: function() {
OSRM.G.markers.reverseMarkers(); OSRM.G.markers.reverseMarkers();
timeoutRoute(); timeoutRoute();
}, },
showRouteSimple: function(response) {
if(!response)
return;
if( !OSRM.G.dragging ) // prevent simple routing when not dragging (required as there can be drag events after a dragstop event!)
return;
if( response.status == 207) {
OSRM.RoutingGeometry.showNA();
OSRM.RoutingDescription.showNA( OSRM.loc("YOUR_ROUTE_IS_BEING_COMPUTED") );
} else {
OSRM.RoutingGeometry.show(response);
OSRM.RoutingDescription.showSimple(response);
OSRM.G.route.storeHistoryRoute();
}
OSRM.Routing._updateHints(response);
if(OSRM.G.pending)
setTimeout(OSRM.Routing.draggingTimeout,1);
},
showRoute: function(response) { showRoute: function(response) {
if(!response) if(!response)
return; return;
@ -92,7 +73,26 @@ showRoute: function(response) {
} }
OSRM.Routing._updateHints(response); OSRM.Routing._updateHints(response);
}, },
showRouteRedraw: function(response) { showRoute_Dragging: function(response) {
if(!response)
return;
if( !OSRM.G.dragging ) // prevent simple routing when not dragging (required as there can be drag events after a dragstop event!)
return;
if( response.status == 207) {
OSRM.RoutingGeometry.showNA();
OSRM.RoutingDescription.showNA( OSRM.loc("YOUR_ROUTE_IS_BEING_COMPUTED") );
} else {
OSRM.RoutingGeometry.show(response);
OSRM.RoutingDescription.showSimple(response);
OSRM.G.route.storeHistoryRoute();
}
OSRM.Routing._updateHints(response);
if(OSRM.G.pending)
setTimeout(OSRM.Routing.draggingTimeout,1);
},
showRoute_Redraw: function(response) {
if(!response) if(!response)
return; return;
@ -102,7 +102,7 @@ showRouteRedraw: function(response) {
} }
OSRM.Routing._updateHints(response); OSRM.Routing._updateHints(response);
}, },
showRouteHistory: function(response, history_id) { showRoute_RedrawHistory: function(response, history_id) {
if(!response) if(!response)
return; return;
@ -136,7 +136,7 @@ getRoute_Reversed: function() {
OSRM.JSONP.clear('dragging'); OSRM.JSONP.clear('dragging');
OSRM.JSONP.clear('redraw'); OSRM.JSONP.clear('redraw');
OSRM.JSONP.clear('route'); OSRM.JSONP.clear('route');
OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=true', OSRM.Routing.showRoute, OSRM.Routing.timeoutRouteReverse, OSRM.DEFAULTS.JSONP_TIMEOUT, 'route'); OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=true', OSRM.Routing.showRoute, OSRM.Routing.timeoutRoute_Reversed, OSRM.DEFAULTS.JSONP_TIMEOUT, 'route');
}, },
getRoute_Redraw: function() { getRoute_Redraw: function() {
if( OSRM.G.markers.route.length < 2 ) if( OSRM.G.markers.route.length < 2 )
@ -144,17 +144,17 @@ getRoute_Redraw: function() {
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.showRouteRedraw, OSRM.Routing.timeoutRoute, OSRM.DEFAULTS.JSONP_TIMEOUT, 'redraw'); OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=true', OSRM.Routing.showRoute_Redraw, OSRM.Routing.timeoutRoute, OSRM.DEFAULTS.JSONP_TIMEOUT, 'redraw');
}, },
getRoute_RedrawHistory: function() { getRoute_RedrawHistory: function() {
for(var i=0; i<10; i++) for(var i=0; i<10; i++)
if( OSRM.G.route._history_data[i].length > 0 ) { if( OSRM.G.route._history_data[i].length > 0 ) {
OSRM.JSONP.clear('history'+i); OSRM.JSONP.clear('history'+i);
OSRM.JSONP.call(OSRM.Routing._buildHistoryCall(i)+'&instructions=false', OSRM.Routing.showRouteHistory, OSRM.JSONP.empty, OSRM.DEFAULTS.JSONP_TIMEOUT, 'history'+i, i); OSRM.JSONP.call(OSRM.Routing._buildHistoryCall(i)+'&instructions=false', OSRM.Routing.showRoute_RedrawHistory, OSRM.JSONP.empty, OSRM.DEFAULTS.JSONP_TIMEOUT, 'history'+i, i);
} }
}, },
getRoute_Dragging: function() { getRoute_Dragging: function() {
OSRM.G.pending = !OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=false', OSRM.Routing.showRouteSimple, OSRM.Routing.timeoutRouteSimple, OSRM.DEFAULTS.JSONP_TIMEOUT, 'dragging');; OSRM.G.pending = !OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=false', OSRM.Routing.showRoute_Dragging, OSRM.Routing.timeoutRoute_Dragging, OSRM.DEFAULTS.JSONP_TIMEOUT, 'dragging');;
}, },
draggingTimeout: function() { draggingTimeout: function() {
OSRM.G.markers.route[OSRM.G.dragid].hint = null; OSRM.G.markers.route[OSRM.G.dragid].hint = null;