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

prepared for bing language specific maps

Browse Source
This commit is contained in:
DennisSchiefer 2012-05-15 17:19:09 +01:00
parent 8d40bc7f4f
commit ba0064af99
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
WebContent/OSRM.config.js
View File

@ -43,13 +43,13 @@ OSRM.DEFAULTS = {
LANGUAGE: "en", LANGUAGE: "en",
LANUGAGE_ONDEMAND_RELOADING: true, LANUGAGE_ONDEMAND_RELOADING: true,
LANGUAGE_SUPPORTED: [ LANGUAGE_SUPPORTED: [
{encoding:"en", name:"English"}, {encoding:"en", name:"English", culture:"en-US"},
{encoding:"de", name:"Deutsch"}, {encoding:"de", name:"Deutsch", culture:"de-DE"},
{encoding:"dk", name:"Dansk"}, {encoding:"dk", name:"Dansk", culture:"en-US"},
{encoding:"fi", name:"Suomi"}, {encoding:"fi", name:"Suomi", culture:"en-US"},
{encoding:"fr", name:"Français"}, {encoding:"fr", name:"Français", culture:"fr-FR"},
{encoding:"it", name:"Italiano"}, {encoding:"it", name:"Italiano", culture:"it-IT"},
{encoding:"pl", name:"Polski"} {encoding:"pl", name:"Polski", culture:"en-US"}
], ],
TILE_SERVERS: [ TILE_SERVERS: [
@ -75,13 +75,13 @@ OSRM.DEFAULTS = {
}, },
{ {
display_name: 'Bing Road', display_name: 'Bing Road',
apikey:'Ag_G9YGvTnWtqqSsQ5S4s44ddrRS7GmC7WO94Vo-NoL_p1TiWdwsYcIDirB3_5q-', apikey:'AjCb2f6Azv_xt9c6pl_xok96bgAYrXQNctnG4o07sTj4iS9N68Za4B3pRJyeCjGr',
type:"Road", type:"Road",
bing:true, bing:true,
}, },
{ {
display_name: 'Bing Aerial', display_name: 'Bing Aerial',
apikey:'Ag_G9YGvTnWtqqSsQ5S4s44ddrRS7GmC7WO94Vo-NoL_p1TiWdwsYcIDirB3_5q-', apikey:'AjCb2f6Azv_xt9c6pl_xok96bgAYrXQNctnG4o07sTj4iS9N68Za4B3pRJyeCjGr',
type:"Aerial", type:"Aerial",
bing:true, bing:true,
} }

4
WebContent/leaflet/TileLayer.Bing.js
View File

@ -110,6 +110,8 @@ L.TileLayer.Bing = L.TileLayer.extend({
} }
return this._url return this._url
//.replace('{culture}', OSRM.Localization.current_culture)
.replace('{culture}', "en-US")
.replace('{subdomain}', subdomains[(xy.x + xy.y) % subdomains.length]) .replace('{subdomain}', subdomains[(xy.x + xy.y) % subdomains.length])
.replace('{quadkey}', quadDigits.join("")); .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); this.options.subdomains = [].concat(res.imageUrlSubdomains);
script.parentNode.removeChild(script); script.parentNode.removeChild(script);
window[this._callbackId] = undefined; // cannot delete from window in IE window[this._callbackId] = undefined; // cannot delete from window in IE

10
WebContent/localization/OSRM.Localization.js
View File

@ -52,11 +52,21 @@ setLanguage: function(language) {
// change value of both language selectors // change value of both language selectors
OSRM.GUI.selectorChange( document.getElementById('gui-language-toggle'), language ); OSRM.GUI.selectorChange( document.getElementById('gui-language-toggle'), language );
OSRM.GUI.selectorChange( document.getElementById('gui-language-2-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]) { if( OSRM.Localization[language]) {
OSRM.Localization.current_language = language; OSRM.Localization.current_language = language;
// change gui language // change gui language
OSRM.GUI.setLabels(); OSRM.GUI.setLabels();
// // change map language
// OSRM.G.map.layerControl.getActiveLayer()._reset();
// OSRM.G.map.layerControl.getActiveLayer()._update();
// requery data // requery data
if( OSRM.G.markers == null ) if( OSRM.G.markers == null )
return; return;