From ba0064af99759fe8d1a84835b7f42abb2514fec3 Mon Sep 17 00:00:00 2001
From: DennisSchiefer <shiin@gmx.de>
Date: Tue, 15 May 2012 17:19:09 +0100
Subject: [PATCH] prepared for bing language specific maps

---
 WebContent/OSRM.config.js                    | 18 +++++++++---------
 WebContent/leaflet/TileLayer.Bing.js         |  4 +++-
 WebContent/localization/OSRM.Localization.js | 10 ++++++++++
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/WebContent/OSRM.config.js b/WebContent/OSRM.config.js
index 5e6c452db..4f21e636d 100644
--- a/WebContent/OSRM.config.js
+++ b/WebContent/OSRM.config.js
@@ -43,13 +43,13 @@ OSRM.DEFAULTS = {
 	LANGUAGE: "en",
 	LANUGAGE_ONDEMAND_RELOADING: true,
 	LANGUAGE_SUPPORTED: [ 
-		{encoding:"en", name:"English"},
-		{encoding:"de", name:"Deutsch"},
-		{encoding:"dk", name:"Dansk"},
-		{encoding:"fi", name:"Suomi"},
-		{encoding:"fr", name:"Français"},
-		{encoding:"it", name:"Italiano"},
-		{encoding:"pl", name:"Polski"}
+		{encoding:"en", name:"English", culture:"en-US"},
+		{encoding:"de", name:"Deutsch", culture:"de-DE"},
+		{encoding:"dk", name:"Dansk", culture:"en-US"},
+		{encoding:"fi", name:"Suomi", culture:"en-US"},
+		{encoding:"fr", name:"Français", culture:"fr-FR"},
+		{encoding:"it", name:"Italiano", culture:"it-IT"},
+		{encoding:"pl", name:"Polski", culture:"en-US"}
 	],
 		
 	TILE_SERVERS: [
@@ -75,13 +75,13 @@ OSRM.DEFAULTS = {
 		},
 		{
 			display_name: 'Bing Road',
-			apikey:'Ag_G9YGvTnWtqqSsQ5S4s44ddrRS7GmC7WO94Vo-NoL_p1TiWdwsYcIDirB3_5q-',
+			apikey:'AjCb2f6Azv_xt9c6pl_xok96bgAYrXQNctnG4o07sTj4iS9N68Za4B3pRJyeCjGr',
 			type:"Road",
 			bing:true,
 		},
 		{
 			display_name: 'Bing Aerial',
-			apikey:'Ag_G9YGvTnWtqqSsQ5S4s44ddrRS7GmC7WO94Vo-NoL_p1TiWdwsYcIDirB3_5q-',
+			apikey:'AjCb2f6Azv_xt9c6pl_xok96bgAYrXQNctnG4o07sTj4iS9N68Za4B3pRJyeCjGr',
 			type:"Aerial",
 			bing:true,
 		}
diff --git a/WebContent/leaflet/TileLayer.Bing.js b/WebContent/leaflet/TileLayer.Bing.js
index 229e87ade..c5eba1e36 100644
--- a/WebContent/leaflet/TileLayer.Bing.js
+++ b/WebContent/leaflet/TileLayer.Bing.js
@@ -110,6 +110,8 @@ L.TileLayer.Bing = L.TileLayer.extend({
     }
 
 		return this._url
+				//.replace('{culture}', OSRM.Localization.current_culture)
+				.replace('{culture}', "en-US")
 				.replace('{subdomain}', subdomains[(xy.x + xy.y) % subdomains.length])
 				.replace('{quadkey}', quadDigits.join(""));		
   },
@@ -174,7 +176,7 @@ L.TileLayer.Bing.processMetadata = function(metadata) {
     }
   }
   
-  this._url = res.imageUrl.replace('{culture}','en-US');
+  this._url = res.imageUrl;
   this.options.subdomains = [].concat(res.imageUrlSubdomains);
   script.parentNode.removeChild(script);
   window[this._callbackId] = undefined; // cannot delete from window in IE
diff --git a/WebContent/localization/OSRM.Localization.js b/WebContent/localization/OSRM.Localization.js
index f65ce350a..69ff58aff 100644
--- a/WebContent/localization/OSRM.Localization.js
+++ b/WebContent/localization/OSRM.Localization.js
@@ -52,11 +52,21 @@ setLanguage: function(language) {
 	// change value of both language selectors
 	OSRM.GUI.selectorChange( document.getElementById('gui-language-toggle'), language );
 	OSRM.GUI.selectorChange( document.getElementById('gui-language-2-toggle'), language );
+//	// change culture value
+//	OSRM.Localization.current_culture = language+"-"+language;
+//	var supported_languages = OSRM.DEFAULTS.LANGUAGE_SUPPORTED;
+//	for(var i=0, size=supported_languages.length; i<size; i++) {
+//		if( supported_languages[i].encoding==language )
+//			OSRM.Localization.current_culture = supported_languages[i].culture;
+//	}
 	
 	if( OSRM.Localization[language]) {
 		OSRM.Localization.current_language = language;
 		// change gui language		
 		OSRM.GUI.setLabels();
+//		// change map language
+//		OSRM.G.map.layerControl.getActiveLayer()._reset();
+//		OSRM.G.map.layerControl.getActiveLayer()._update();
 		// requery data
 		if( OSRM.G.markers == null )
 			return;