From 826cbc9a241583491a467f3561c33610c31440b8 Mon Sep 17 00:00:00 2001
From: shiin <shiin@T42>
Date: Sun, 6 May 2012 19:10:43 +0200
Subject: [PATCH] added parameter to set meters/miles, changed toHumanDistance
 functions so that conditions don't need to be checked all the time

---
 WebContent/gui/OSRM.RoutingGUI.js             |  2 +-
 WebContent/main.js                            |  6 +++
 WebContent/routing/OSRM.RoutingDescription.js |  1 +
 WebContent/utils/OSRM.Utils.js                | 41 +++++++++++--------
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/WebContent/gui/OSRM.RoutingGUI.js b/WebContent/gui/OSRM.RoutingGUI.js
index f8674bbb9..5004c6236 100644
--- a/WebContent/gui/OSRM.RoutingGUI.js
+++ b/WebContent/gui/OSRM.RoutingGUI.js
@@ -24,7 +24,7 @@ OSRM.GUI.extend( {
 // init
 init: function() {
 	// init variables
-	OSRM.G.DISTANCE_FORMAT = OSRM.DEFAULTS.DISTANCE_FORMAT;
+	OSRM.Utils.setToHumanDistanceFunction(OSRM.DEFAULTS.DISTANCE_FORMAT);
 	
 	// init events
 	document.getElementById("gui-input-source").onchange = function() {OSRM.GUI.inputChanged(OSRM.C.SOURCE_LABEL);};
diff --git a/WebContent/main.js b/WebContent/main.js
index 12f7d0654..cd14bc3b4 100644
--- a/WebContent/main.js
+++ b/WebContent/main.js
@@ -165,6 +165,12 @@ OSRM.parseParameters = function(){
 		if(name_val[0] == 'hl') {
 			OSRM.Localization.setLanguage(name_val[1]);
 		}
+		else if(name_val[0] == 'df') {
+			var type = parseInt(name_val[1]);
+			if(type != 0 && type != 1)
+				return;
+			OSRM.Utils.setToHumanDistanceFunction(type);
+		}		
 		else if(name_val[0] == 'loc') {
 			var coordinates = unescape(name_val[1]).split(',');
 			if(coordinates.length!=2 || !OSRM.Utils.isLatitude(coordinates[0]) || !OSRM.Utils.isLongitude(coordinates[1]) )
diff --git a/WebContent/routing/OSRM.RoutingDescription.js b/WebContent/routing/OSRM.RoutingDescription.js
index 5cfd4c779..88dd69ce9 100644
--- a/WebContent/routing/OSRM.RoutingDescription.js
+++ b/WebContent/routing/OSRM.RoutingDescription.js
@@ -31,6 +31,7 @@ onClickRouteDescription: function(geometry_index) {
 },
 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 += '&df=' + OSRM.G.DISTANCE_FORMAT;
 	
 	var source = OSRM.DEFAULTS.SHORTENER_PARAMETERS.replace(/%url/, OSRM.DEFAULTS.HOST_SHORTENER_URL+src); 
 	
diff --git a/WebContent/utils/OSRM.Utils.js b/WebContent/utils/OSRM.Utils.js
index b1147c259..ea544ed8e 100644
--- a/WebContent/utils/OSRM.Utils.js
+++ b/WebContent/utils/OSRM.Utils.js
@@ -31,30 +31,39 @@ toHumanTime: function(seconds){
    hours = parseInt(minutes/60);
    minutes = minutes%60;
    if(hours==0){
-   	return minutes + '&nbsp;' + 'min';
+	   return minutes + '&nbsp;' + 'min';
    }
    else{
-   	return hours + '&nbsp;' + 'h' + '&nbsp;' + minutes + '&nbsp;' + 'min';
+	   return hours + '&nbsp;' + 'h' + '&nbsp;' + minutes + '&nbsp;' + 'min';
    }
 },
 //human readable distance
-toHumanDistance: function(meters){
+setToHumanDistanceFunction: function(type) {
+	OSRM.G.DISTANCE_FORMAT = type;
+	if( type == 1 )
+		OSRM.Utils.toHumanDistance = OSRM.Utils.toHumanDistanceMiles;
+	else
+		OSRM.Utils.toHumanDistance = OSRM.Utils.toHumanDistanceMeters;	
+},
+toHumanDistanceMeters: function(meters){
 	var distance = parseInt(meters);
 	
-	if(OSRM.G.DISTANCE_FORMAT == 1) {	// miles
-		distance = distance / 1609.344;
-		if(distance >= 100){ return (distance).toFixed(0)+'&nbsp;' + 'mi'; }
-		else if(distance >= 10){ return (distance).toFixed(1)+'&nbsp;' + 'mi'; }
-		else if(distance >= 0.1){ return (distance).toFixed(2)+'&nbsp;' + 'mi'; }
-		else{ return (distance*5280).toFixed(0)+'&nbsp;' + 'ft'; }
-	} else {	// default to km, m
-		distance = distance / 1000;
-		if(distance >= 100){ return (distance).toFixed(0)+'&nbsp;' + 'km'; }
-		else if(distance >= 10){ return (distance).toFixed(1)+'&nbsp;' + 'km'; }
-		else if(distance >= 0.1){ return (distance).toFixed(2)+'&nbsp;' + 'km'; }
-		else{ return (distance*1000).toFixed(0)+'&nbsp;' + 'm'; }		
-	}
+	distance = distance / 1000;
+	if(distance >= 100){ return (distance).toFixed(0)+'&nbsp;' + 'km'; }
+	else if(distance >= 10){ return (distance).toFixed(1)+'&nbsp;' + 'km'; }
+	else if(distance >= 0.1){ return (distance).toFixed(2)+'&nbsp;' + 'km'; }
+	else{ return (distance*1000).toFixed(0)+'&nbsp;' + 'm'; }		
 },
+toHumanDistanceMiles: function(meters){
+	var distance = parseInt(meters);
+	
+	distance = distance / 1609.344;
+	if(distance >= 100){ return (distance).toFixed(0)+'&nbsp;' + 'mi'; }
+	else if(distance >= 10){ return (distance).toFixed(1)+'&nbsp;' + 'mi'; }
+	else if(distance >= 0.1){ return (distance).toFixed(2)+'&nbsp;' + 'mi'; }
+	else{ return (distance*5280).toFixed(0)+'&nbsp;' + 'ft'; }
+},
+toHumanDistance: null,
 
 
 // [verification routines]