From 9a6c6cd485c488580fd69d4182ee2b15e800bccf Mon Sep 17 00:00:00 2001
From: DennisSchiefer <shiin@gmx.de>
Date: Tue, 14 Aug 2012 06:59:42 +0100
Subject: [PATCH] added routing_engine and routing_metric to describe the
 currently chosen routing

---
 WebContent/main.js                            | 19 +++++++++++++------
 WebContent/routing/OSRM.Routing.js            |  5 +++--
 WebContent/routing/OSRM.RoutingDescription.js |  3 ++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/WebContent/main.js b/WebContent/main.js
index d40df8834..2ae1b93af 100644
--- a/WebContent/main.js
+++ b/WebContent/main.js
@@ -238,11 +238,17 @@ OSRM.parseParameters = function(){
 				return;
 			params.active_alternative = active_alternative;
 		}
-		else if(name_val[0] == 'rs') {
-			var active_routing_server_id = Number(name_val[1]);
-			if( active_routing_server_id<0 || active_routing_server_id>=OSRM.DEFAULTS.HOST_ROUTING_URL.length)
+		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_server_id = active_routing_server_id;
+			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;
 		}		
 	}
 		
@@ -287,8 +293,9 @@ OSRM.parseParameters = function(){
 		OSRM.G.active_alternative = params.active_alternative || 0;
 		
 		// set routing server
-		OSRM.G.active_routing_server_id = params.active_routing_server_id || 0;
-		OSRM.G.active_routing_server_url = OSRM.DEFAULTS.HOST_ROUTING_URL[ OSRM.G.active_routing_server_id ];
+		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});
diff --git a/WebContent/routing/OSRM.Routing.js b/WebContent/routing/OSRM.Routing.js
index 7e481b18e..aabffb9f0 100644
--- a/WebContent/routing/OSRM.Routing.js
+++ b/WebContent/routing/OSRM.Routing.js
@@ -31,8 +31,9 @@ OSRM.Routing = {
 		
 // init routing data structures
 init: function() {
-	OSRM.G.active_routing_server_id = 0;
-	OSRM.G.active_routing_server_url = OSRM.DEFAULTS.HOST_ROUTING_URL[ OSRM.G.active_routing_server_id ];
+	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:[] };
diff --git a/WebContent/routing/OSRM.RoutingDescription.js b/WebContent/routing/OSRM.RoutingDescription.js
index c72f4142b..a8c5ed37c 100644
--- a/WebContent/routing/OSRM.RoutingDescription.js
+++ b/WebContent/routing/OSRM.RoutingDescription.js
@@ -31,7 +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 += '&rs=' + OSRM.G.active_routing_server_id;
+	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);