diff --git a/WebContent/OSRM.Map.js b/WebContent/OSRM.Map.js index f53874d59..aebb36466 100644 --- a/WebContent/OSRM.Map.js +++ b/WebContent/OSRM.Map.js @@ -72,56 +72,34 @@ init: function() { OSRM.GUI.init(); // setup tile servers - var osmorgURL = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', - osmorgAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 Mapnik', - osmorgOptions = {maxZoom: 18, attribution: osmorgAttribution}; - - var osmdeURL = 'http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', - osmdeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 Mapnik', - osmdeOptions = {maxZoom: 18, attribution: osmdeAttribution}; - - var mapquestURL = 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', - mapquestAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 MapQuest', - mapquestOptions = {maxZoom: 18, attribution: mapquestAttribution, subdomains: '1234'}; - - var cloudmadeURL = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png', - cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade', - cloudmadeOptions = {maxZoom: 18, attribution: cloudmadeAttribution}; - - var osmorg = new L.TileLayer(osmorgURL, osmorgOptions), - osmde = new L.TileLayer(osmdeURL, osmdeOptions), - mapquest = new L.TileLayer(mapquestURL, mapquestOptions), - cloudmade = new L.TileLayer(cloudmadeURL, cloudmadeOptions); + var tile_servers = OSRM.DEFAULTS.TILE_SERVERS; + var base_maps = {}; + for(var i=0, size=tile_servers.length; i routes are not hidden during zoom + fadeAnimation: false }); - // add tileservers - var baseMaps = { - "osm.org": osmorg, - "osm.de": osmde, - "MapQuest": mapquest, - "CloudMade": cloudmade - }; - - var overlayMaps = {}; - var layersControl = new L.Control.Layers(baseMaps, overlayMaps); + // add layer control + var layersControl = new L.Control.Layers(base_maps, {}); OSRM.G.map.addControl(layersControl); // move zoom markers getElementsByClassName(document,'leaflet-control-zoom')[0].style.left=(OSRM.GUI.width+10)+"px"; getElementsByClassName(document,'leaflet-control-zoom')[0].style.top="5px"; - // initial map position and zoom + // initial correct map position and zoom (respect UI visibility, use browser position) var position = new L.LatLng( OSRM.DEFAULTS.ONLOAD_LATITUDE, OSRM.DEFAULTS.ONLOAD_LONGITUDE); OSRM.G.map.setViewUI( position, OSRM.DEFAULTS.ZOOM_LEVEL); - if (navigator.geolocation && document.URL.indexOf("file://") == -1) + if (navigator.geolocation && document.URL.indexOf("file://") == -1) // convenience during development, as FF doesn't save rights for local files navigator.geolocation.getCurrentPosition(OSRM.Map.geolocationResponse); // map events diff --git a/WebContent/OSRM.config.js b/WebContent/OSRM.config.js index d91e204d4..0f84a16e8 100644 --- a/WebContent/OSRM.config.js +++ b/WebContent/OSRM.config.js @@ -24,14 +24,44 @@ OSRM.DEFAULTS = { HOST_GEOCODER_URL: 'http://nominatim.openstreetmap.org/search', HOST_REVERSE_GEOCODER_URL: 'http://nominatim.openstreetmap.org/reverse', WEBSITE_URL: document.URL.replace(/#*(\?.*|$)/i,""), // truncates URL before first ?, and removes tailing # - JSONP_TIMEOUT: 5000, + JSONP_TIMEOUT: 10000, ZOOM_LEVEL: 14, ONLOAD_LATITUDE: 48.84, ONLOAD_LONGITUDE: 10.10, ONLOAD_SOURCE: "", ONLOAD_TARGET: "", HIGHLIGHT_ZOOM_LEVEL: 16, + GEOCODER_BOUNDS: '', // the world is not enough! + //GEOCODER_BOUNDS: '&bounded=1&viewbox=-27.0,72.0,46.0,36.0', // bounds for Europe + LANGUAGE: "en", LANGUAGE_FILES_DIRECTORY: "localization/", - GEOCODER_BOUNDS: '&bounded=1&viewbox=-27.0,72.0,46.0,36.0' + LANUGAGE_ONDEMAND_RELOADING: true, + LANGUAGE_SUPPORTED: [ + {display_name:"en", encoding:"en"}, + {display_name:"de", encoding:"de"} + ], + + TILE_SERVERS: [ + { display_name: 'osm.org', + url:'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + attribution:'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 Mapnik', + options:{maxZoom: 18} + }, + { display_name: 'osm.de', + url:'http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', + attribution:'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 Mapnik', + options:{maxZoom: 18} + }, + { display_name: 'MapQuest', + url:'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', + attribution:'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 MapQuest', + options:{maxZoom: 18, subdomains: '1234'} + }, + { display_name: 'CloudMade', + url:'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png', + attribution:'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade', + options:{maxZoom: 18} + } + ] }; diff --git a/WebContent/localization/OSRM.Locale.de.js b/WebContent/localization/OSRM.Locale.de.js index 74bfd35ea..2a5d49f2e 100644 --- a/WebContent/localization/OSRM.Locale.de.js +++ b/WebContent/localization/OSRM.Locale.de.js @@ -84,5 +84,5 @@ OSRM.Localization["de"] = { }; // set GUI language on load -if( OSRM.Localization.use_ondemand_reloading==true) +if( OSRM.DEFAULTS.LANUGAGE_ONDEMAND_RELOADING==true ) OSRM.Localization.setLanguage("de"); \ No newline at end of file diff --git a/WebContent/localization/OSRM.Locale.en.js b/WebContent/localization/OSRM.Locale.en.js index 2bb1d514e..a67d5bbf1 100644 --- a/WebContent/localization/OSRM.Locale.en.js +++ b/WebContent/localization/OSRM.Locale.en.js @@ -84,5 +84,5 @@ OSRM.Localization["en"] = { }; //set GUI language on load -if( OSRM.Localization.use_ondemand_reloading==true) +if( OSRM.DEFAULTS.LANUGAGE_ONDEMAND_RELOADING == true ) OSRM.Localization.setLanguage("en"); \ No newline at end of file diff --git a/WebContent/localization/OSRM.Localization.js b/WebContent/localization/OSRM.Localization.js index ba2240138..eb8ac9f0a 100644 --- a/WebContent/localization/OSRM.Localization.js +++ b/WebContent/localization/OSRM.Localization.js @@ -21,10 +21,6 @@ or see http://www.gnu.org/licenses/agpl.txt. OSRM.Localization = { -use_ondemand_reloading: true, -supported_languages: [ {display_name:"en", encoding:"en"}, - {display_name:"de", encoding:"de"} -], current_language: OSRM.DEFAULTS.LANGUAGE, // initialize localization @@ -36,10 +32,11 @@ init: function() { select.onchange = function() { OSRM.Localization.setLanguage(this.value); }; // fill dropdown menu - for(var i=0, size=OSRM.Localization.supported_languages.length; i