From e39479b908694dd118354e869cfaf01a1916d0ba Mon Sep 17 00:00:00 2001 From: DennisSchiefer Date: Wed, 9 May 2012 17:27:11 +0100 Subject: [PATCH] changes localization to new selector elements, completed units selector, modified localization selector --- WebContent/OSRM.config.js | 12 ++--- WebContent/gui/OSRM.MainGUI.js | 21 ++++++-- WebContent/localization/OSRM.Localization.js | 52 ++++++-------------- WebContent/main.css | 27 ++++++---- WebContent/main.html | 25 +++++++--- WebContent/main.js | 2 +- 6 files changed, 74 insertions(+), 65 deletions(-) diff --git a/WebContent/OSRM.config.js b/WebContent/OSRM.config.js index 3e8701590..c72a16618 100644 --- a/WebContent/OSRM.config.js +++ b/WebContent/OSRM.config.js @@ -42,12 +42,12 @@ OSRM.DEFAULTS = { LANGUAGE: "en", LANUGAGE_ONDEMAND_RELOADING: true, LANGUAGE_SUPPORTED: [ - {display_name:"en", encoding:"en"}, - {display_name:"da", encoding:"da"}, - {display_name:"de", encoding:"de"}, - {display_name:"fi", encoding:"fi"}, - {display_name:"fr", encoding:"fr"}, - {display_name:"pl", encoding:"pl"} + {encoding:"en", name:"English"}, + {encoding:"da", name:"Dansk"}, + {encoding:"de", name:"Deutsch"}, + {encoding:"fi", name:"Suomi"}, + {encoding:"fr", name:"Français"}, + {encoding:"pl", name:"Polski"} ], TILE_SERVERS: [ diff --git a/WebContent/gui/OSRM.MainGUI.js b/WebContent/gui/OSRM.MainGUI.js index 0a95c4ded..e2bcb2b18 100644 --- a/WebContent/gui/OSRM.MainGUI.js +++ b/WebContent/gui/OSRM.MainGUI.js @@ -41,8 +41,8 @@ init: function() { document.getElementById('gui-input-source').value = OSRM.DEFAULTS.ONLOAD_SOURCE; document.getElementById('gui-input-target').value = OSRM.DEFAULTS.ONLOAD_TARGET; - // set default language - OSRM.Localization.setLanguage( OSRM.DEFAULTS.LANGUAGE ); + // init units selector + OSRM.GUI.initSelector( "gui-units-toggle", [{display:"Kilometers",value:0},{display:"Miles",value:1}], 0, OSRM.GUI.onUnitsChanged ); }, // set language dependent labels @@ -52,6 +52,7 @@ setLabels: function() { document.getElementById("gui-reset").innerHTML = OSRM.loc("GUI_RESET"); document.getElementById("gui-reverse").innerHTML = OSRM.loc("GUI_REVERSE"); document.getElementById("gui-option-highlight-nonames-label").innerHTML = OSRM.loc("GUI_HIGHLIGHT_UNNAMED_ROADS"); + document.getElementById("gui-option-show-previous-routes-label").innerHTML = OSRM.loc("GUI_SHOW_PREVIOUS_ROUTES"); document.getElementById("gui-search-source").innerHTML = OSRM.loc("GUI_SEARCH"); document.getElementById("gui-search-target").innerHTML = OSRM.loc("GUI_SEARCH"); document.getElementById("gui-search-source-label").innerHTML = OSRM.loc("GUI_START")+":"; @@ -61,8 +62,12 @@ setLabels: function() { document.getElementById("legal-notice").innerHTML = OSRM.loc("GUI_LEGAL_NOTICE"); document.getElementById("gui-mapping-label").innerHTML = OSRM.loc("GUI_MAPPING_TOOLS"); document.getElementById("gui-config-label").innerHTML = OSRM.loc("GUI_CONFIGURATION"); - document.getElementById("gui-language-label").innerHTML = OSRM.loc("GUI_LANGUAGE"); - document.getElementById("gui-units-label").innerHTML = OSRM.loc("GUI_UNITS"); + document.getElementById("gui-language-label").innerHTML = OSRM.loc("GUI_LANGUAGE")+":"; + document.getElementById("gui-units-label").innerHTML = OSRM.loc("GUI_UNITS")+":"; + + document.getElementById("gui-units-toggle").getElementsByTagName("option")[0].innerHTML = OSRM.loc("GUI_KILOMETERS"); + document.getElementById("gui-units-toggle").getElementsByTagName("option")[1].innerHTML = OSRM.loc("GUI_MILES"); + OSRM.GUI.selectorOnChange( document.getElementById("gui-units-toggle") ); }, // clear output area @@ -85,6 +90,12 @@ afterMainTransition: function() { zoom_controls[0].style.left = ( OSRM.G.main_handle.boxVisible() == true ? (OSRM.G.main_handle.boxWidth()+10) : "30") + "px"; zoom_controls[0].style.visibility="visible"; } +}, + +// toggle distance units +onUnitsChanged: function(value) { + OSRM.Utils.setToHumanDistanceFunction(value); + OSRM.Routing.getRoute(); } -}); +}); \ No newline at end of file diff --git a/WebContent/localization/OSRM.Localization.js b/WebContent/localization/OSRM.Localization.js index 1b71f6143..f674ac274 100644 --- a/WebContent/localization/OSRM.Localization.js +++ b/WebContent/localization/OSRM.Localization.js @@ -27,53 +27,31 @@ DIRECTORY: "localization/", // holds currently active language current_language: OSRM.DEFAULTS.LANGUAGE, -// initialize localization +//initialize localization init: function() { - // create dropdown menu - var select = document.createElement('select'); - select.id = "gui-language-toggle"; - select.className = "top-left-button"; - select.onchange = function() { OSRM.Localization.setLanguage(this.value); }; - - // fill dropdown menu + // fill option list and find default entry + var options = []; + var options_2 = []; + var selected = 0; var supported_languages = OSRM.DEFAULTS.LANGUAGE_SUPPORTED; for(var i=0, size=supported_languages.length; i + @@ -84,7 +85,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
-
+
@@ -92,31 +93,42 @@ or see http://www.gnu.org/licenses/agpl.txt.
Language:
-
x
+
Units:
-
x
+
+
-
+
Mapping Tools
+
- + Highlight unnamed streets
-
+
+
+
+ +Show previous routes +
+
+
+
JOSM OSM Bugs
+
@@ -128,6 +140,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
+
diff --git a/WebContent/main.js b/WebContent/main.js index 7cd8c3029..129d1de04 100644 --- a/WebContent/main.js +++ b/WebContent/main.js @@ -25,8 +25,8 @@ OSRM.init = function() { OSRM.prefetchIcons(); OSRM.prefetchCSSIcons(); - OSRM.Localization.init(); OSRM.GUI.init(); + OSRM.Localization.init(); OSRM.Map.init(); OSRM.Printing.init(); OSRM.Routing.init();