Merge branch 'trial/multiple_servers' into trial/leaflet04

WebContent/OSRM.config.js

@@ -19,7 +19,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 // [has to be loaded directly after OSRM.base]
 
 OSRM.DEFAULTS = {
-	HOST_ROUTING_URL: 'http://router.project-osrm.org/viaroute',
+	HOST_ROUTING_URL: ['http://router.project-osrm.org/viaroute'],
 	HOST_SHORTENER_URL: 'http://map.project-osrm.org/shorten/',
 	HOST_TIMESTAMP_URL: 'http://router.project-osrm.org/timestamp',
 	HOST_GEOCODER_URL: 'http://nominatim.openstreetmap.org/search',

WebContent/base/OSRM.HistoryRoutes.js

@@ -169,7 +169,7 @@ OSRM.extend( OSRM.HistoryRoute,{
 			}
 	},
 	_buildCall: function(history_id) {
-		var source = OSRM.DEFAULTS.HOST_ROUTING_URL;
+		var source = OSRM.G.active_routing_server_url;
 		source += '?z=' + OSRM.G.map.getZoom() + '&output=json&jsonp=%jsonp';
 		
 		if(this._history[history_id].checksum)
@@ -190,4 +190,4 @@ OSRM.extend( OSRM.HistoryRoute,{
 		for(var i=0; i<hints.length; i++)
 			this._history[history_id].markers[i].hint = hints[i];		
 	}
-});
+});

WebContent/main.js

@@ -242,6 +242,18 @@ OSRM.parseParameters = function(){
 				return;
 			params.active_alternative = active_alternative;
 		}
+		else if(name_val[0] == 're') {
+			var active_routing_engine = Number(name_val[1]);
+			if( active_routing_engine<0 || active_routing_engine>=OSRM.DEFAULTS.HOST_ROUTING_URL.length)
+				return;
+			params.active_routing_engine = active_routing_engine;
+		}
+		else if(name_val[0] == 'rm') {
+			var active_routing_metric = Number(name_val[1]);
+			if( active_routing_metric<0 )
+				return;
+			params.active_routing_metric = active_routing_metric;
+		}		
 	}
 		
 	// case 1: destination given
@@ -283,6 +295,11 @@ OSRM.parseParameters = function(){
 		
 		// set active alternative (if via points are set or alternative does not exists: automatic fallback to shortest route)
 		OSRM.G.active_alternative = params.active_alternative || 0;
+		
+		// set routing server
+		OSRM.G.active_routing_engine = params.active_routing_engine || 0;
+		OSRM.G.active_routing_metric = params.active_routing_metric || 0;
+		OSRM.G.active_routing_server_url = OSRM.DEFAULTS.HOST_ROUTING_URL[ OSRM.G.active_routing_engine ];
 			
 		// compute route
 		OSRM.Routing.getRoute({keepAlternative:true});

WebContent/routing/OSRM.Routing.js

@@ -31,6 +31,9 @@ OSRM.Routing = {
 		
 // init routing data structures
 init: function() {
+	OSRM.G.active_routing_engine = 0;
+	OSRM.G.active_routing_metric = 0;
+	OSRM.G.active_routing_server_url = OSRM.DEFAULTS.HOST_ROUTING_URL[ OSRM.G.active_routing_engine ];
 	OSRM.G.markers = new OSRM.Markers();	
 	OSRM.G.route = new OSRM.Route();
 	OSRM.G.response = { via_points:[] };
@@ -159,7 +162,7 @@ draggingTimeout: function() {
 },
 
 _buildCall: function() {
-	var source = OSRM.DEFAULTS.HOST_ROUTING_URL;
+	var source = OSRM.G.active_routing_server_url;
 	source += '?z=' + OSRM.G.map.getZoom() + '&output=json&jsonp=%jsonp';	
 	if(OSRM.G.markers.checksum)
 		source += '&checksum=' + OSRM.G.markers.checksum;

WebContent/routing/OSRM.RoutingDescription.js

@@ -31,6 +31,8 @@ onClickCreateShortcut: function(src){
 	src += '&z='+ OSRM.G.map.getZoom() + '&center=' + OSRM.G.map.getCenter().lat.toFixed(6) + ',' + OSRM.G.map.getCenter().lng.toFixed(6);
 	src += '&alt='+OSRM.G.active_alternative;
 	src += '&df=' + OSRM.G.DISTANCE_FORMAT;
+	src += '&re=' + OSRM.G.active_routing_engine;
+	src += '&rm=' + OSRM.G.active_routing_metric;
 	
 	var source = OSRM.DEFAULTS.SHORTENER_PARAMETERS.replace(/%url/, OSRM.DEFAULTS.HOST_SHORTENER_URL+src); 
 	
@@ -61,7 +63,7 @@ show: function(response) {
 	var route_link ='[<a class="route-link" onclick="OSRM.RoutingDescription.onClickCreateShortcut(\'' + OSRM.DEFAULTS.WEBSITE_URL + query_string + '\')">'+OSRM.loc("GET_LINK_TO_ROUTE")+'</a>]';
 
 	// create GPX link
-	var gpx_link = '[<a class="route-link" onClick="document.location.href=\'' + OSRM.DEFAULTS.HOST_ROUTING_URL + query_string + '&output=gpx\';">'+OSRM.loc("GPX_FILE")+'</a>]';
+	var gpx_link = '[<a class="route-link" onClick="document.location.href=\'' + OSRM.G.active_routing_server_url + query_string + '&output=gpx\';">'+OSRM.loc("GPX_FILE")+'</a>]';
 		
 	// create route description
 	var positions = OSRM.G.route.getPositions();