From e706a9867d608ee5f6fb2bb52228454144bc32c2 Mon Sep 17 00:00:00 2001
From: DennisSchiefer <shiin@gmx.de>
Date: Mon, 14 May 2012 17:50:17 +0100
Subject: [PATCH] data_updated -> data_timestamp

---
 WebContent/OSRM.config.js                 |  1 +
 WebContent/base/OSRM.HistoryRoutes.js     |  2 +-
 WebContent/gui/OSRM.MainGUI.js            | 14 +++++++-------
 WebContent/localization/OSRM.Locale.de.js |  2 +-
 WebContent/localization/OSRM.Locale.dk.js |  2 +-
 WebContent/localization/OSRM.Locale.en.js |  2 +-
 WebContent/localization/OSRM.Locale.fi.js |  2 +-
 WebContent/localization/OSRM.Locale.fr.js |  2 +-
 WebContent/localization/OSRM.Locale.it.js |  2 +-
 WebContent/localization/OSRM.Locale.pl.js |  2 +-
 WebContent/main.html                      |  4 ++--
 11 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/WebContent/OSRM.config.js b/WebContent/OSRM.config.js
index da6e7ac32..5aa3115f6 100644
--- a/WebContent/OSRM.config.js
+++ b/WebContent/OSRM.config.js
@@ -21,6 +21,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 OSRM.DEFAULTS = {
 	HOST_ROUTING_URL: 'http://router.project-osrm.org/viaroute',
 	HOST_SHORTENER_URL: 'http://map.project-osrm.org/shorten/',
+	HOST_TIMESTAMP_URL: 'http://router.project-osrm.org/timestamp',
 	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 #
diff --git a/WebContent/base/OSRM.HistoryRoutes.js b/WebContent/base/OSRM.HistoryRoutes.js
index caa17acce..7f11b44da 100644
--- a/WebContent/base/OSRM.HistoryRoutes.js
+++ b/WebContent/base/OSRM.HistoryRoutes.js
@@ -128,7 +128,7 @@ OSRM.extend( OSRM.HistoryRoute,{
 		}
 	},
 	
-	// get positions of current markers (note: data of jsonp response used, as not all data structures updated!)
+	// get positions of current markers (data of jsonp response used, as not all data structures up-to-date!)
 	_getCurrentMarkers: function() {
 		var route = [];
 		
diff --git a/WebContent/gui/OSRM.MainGUI.js b/WebContent/gui/OSRM.MainGUI.js
index 5d8b7ddf6..7d5a91ef6 100644
--- a/WebContent/gui/OSRM.MainGUI.js
+++ b/WebContent/gui/OSRM.MainGUI.js
@@ -45,8 +45,8 @@ init: function() {
 	OSRM.GUI.selectorInit( "gui-units-toggle", [{display:"Kilometers",value:0},{display:"Miles",value:1}], 0, OSRM.GUI.onUnitsChanged );
 	
 	// query last update of data
-	OSRM.G.data_updated = "n/a";
-	OSRM.JSONP.call('OSRM.DEFAULTS.HOST_ROUTING_URL?data_updated=true', OSRM.GUI.setDataUpdated, OSRM.JSONP.empty, OSRM.DEFAULTS.JSONP_TIMEOUT, 'data_updated');
+	OSRM.G.data_timestamp = "n/a";
+	OSRM.JSONP.call('OSRM.DEFAULTS.HOST_TIMESTAMP_URL', OSRM.GUI.setDataTimestamp, OSRM.JSONP.empty, OSRM.DEFAULTS.JSONP_TIMEOUT, 'data_timestamp');
 },
 
 // set language dependent labels
@@ -68,7 +68,7 @@ setLabels: function() {
 	document.getElementById("gui-config-label").innerHTML = OSRM.loc("GUI_CONFIGURATION");
 	document.getElementById("gui-language-2-label").innerHTML = OSRM.loc("GUI_LANGUAGE")+":";
 	document.getElementById("gui-units-label").innerHTML = OSRM.loc("GUI_UNITS")+":";
-	document.getElementById('gui-data-updated').innerHTML = OSRM.loc("GUI_DATA_UPDATED")+": " + OSRM.G.data_updated;
+	document.getElementById('gui-data-timestamp').innerHTML = OSRM.loc("GUI_DATA_TIMESTAMP")+": " + OSRM.G.data_timestamp;
 	
 	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");
@@ -103,13 +103,13 @@ onUnitsChanged: function(value) {
 	OSRM.Routing.getRoute();
 },
 
-// set time when data was last updated
-setDataUpdated: function(response) {
+// set timestamp of data
+setDataTimestamp: function(response) {
 	if(!response)
 		return;
 	
-	OSRM.G.data_updated = response.data_updated;
-	document.getElementById('gui-data-updated').innerHTML = OSRM.loc("GUI_DATA_UPDATED")+": " + OSRM.G.data_updated;
+	OSRM.G.data_timestamp = response.timestamp;
+	document.getElementById('gui-data-timestamp').innerHTML = OSRM.loc("GUI_DATA_TIMESTAMP")+": " + OSRM.G.data_timestamp;
 }
 
 });
\ No newline at end of file
diff --git a/WebContent/localization/OSRM.Locale.de.js b/WebContent/localization/OSRM.Locale.de.js
index 68ff6741f..29fcf1a4f 100644
--- a/WebContent/localization/OSRM.Locale.de.js
+++ b/WebContent/localization/OSRM.Locale.de.js
@@ -37,7 +37,7 @@ OSRM.Localization["de"] = {
 "GUI_UNITS": "Einheiten",
 "GUI_KILOMETERS": "Kilometer",
 "GUI_MILES": "Meilen",
-"GUI_DATA_UPDATED": "data",
+"GUI_DATA_TIMESTAMP": "data",
 // mapping
 "GUI_MAPPING_TOOLS": "Kartenwerkzeuge",
 "GUI_HIGHLIGHT_UNNAMED_ROADS": "Unbenannte Straßen hervorheben",
diff --git a/WebContent/localization/OSRM.Locale.dk.js b/WebContent/localization/OSRM.Locale.dk.js
index f2cd75ebf..91850e5b0 100644
--- a/WebContent/localization/OSRM.Locale.dk.js
+++ b/WebContent/localization/OSRM.Locale.dk.js
@@ -37,7 +37,7 @@ OSRM.Localization["dk"] = {
 "GUI_UNITS": "Enheder",
 "GUI_KILOMETERS": "Kilometer",
 "GUI_MILES": "Miles",
-"GUI_DATA_UPDATED": "data",
+"GUI_DATA_TIMESTAMP": "data",
 // mapping
 "GUI_MAPPING_TOOLS": "Kortlægnings værktøjer",
 "GUI_HIGHLIGHT_UNNAMED_ROADS": "Fremhæv unavngivne veje",
diff --git a/WebContent/localization/OSRM.Locale.en.js b/WebContent/localization/OSRM.Locale.en.js
index 1d386b9a7..f4ab40d28 100644
--- a/WebContent/localization/OSRM.Locale.en.js
+++ b/WebContent/localization/OSRM.Locale.en.js
@@ -37,7 +37,7 @@ OSRM.Localization["en"] = {
 "GUI_UNITS": "Units",
 "GUI_KILOMETERS": "Kilometers",
 "GUI_MILES": "Miles",
-"GUI_DATA_UPDATED": "data",
+"GUI_DATA_TIMESTAMP": "data",
 // mapping
 "GUI_MAPPING_TOOLS": "Mapping Tools",
 "GUI_HIGHLIGHT_UNNAMED_ROADS": "Highlight unnamed streets",
diff --git a/WebContent/localization/OSRM.Locale.fi.js b/WebContent/localization/OSRM.Locale.fi.js
index f889cf180..bebfe5325 100644
--- a/WebContent/localization/OSRM.Locale.fi.js
+++ b/WebContent/localization/OSRM.Locale.fi.js
@@ -37,7 +37,7 @@ OSRM.Localization["fi"] = {
 "GUI_UNITS": "Yksiköt",
 "GUI_KILOMETERS": "Kilometri",
 "GUI_MILES": "Miles",
-"GUI_DATA_UPDATED": "data",
+"GUI_DATA_TIMESTAMP": "data",
 // mapping
 "GUI_MAPPING_TOOLS": "Kartoitustyökalut",
 "GUI_HIGHLIGHT_UNNAMED_ROADS": "Korosta nimettömät tiet",
diff --git a/WebContent/localization/OSRM.Locale.fr.js b/WebContent/localization/OSRM.Locale.fr.js
index 2aa7bd420..ecc256f88 100644
--- a/WebContent/localization/OSRM.Locale.fr.js
+++ b/WebContent/localization/OSRM.Locale.fr.js
@@ -37,7 +37,7 @@ OSRM.Localization["fr"] = {
 "GUI_UNITS": "Unités",
 "GUI_KILOMETERS": "Kilomètres",
 "GUI_MILES": "Miles",
-"GUI_DATA_UPDATED": "data",
+"GUI_DATA_TIMESTAMP": "data",
 // mapping
 "GUI_MAPPING_TOOLS": "Outils de cartographie",
 "GUI_HIGHLIGHT_UNNAMED_ROADS": "Surligner les rues sans nom",
diff --git a/WebContent/localization/OSRM.Locale.it.js b/WebContent/localization/OSRM.Locale.it.js
index 99f852c9a..c8b6ad717 100644
--- a/WebContent/localization/OSRM.Locale.it.js
+++ b/WebContent/localization/OSRM.Locale.it.js
@@ -37,7 +37,7 @@ OSRM.Localization["it"] = {
 "GUI_UNITS": "Unità",
 "GUI_KILOMETERS": "Chilometri",
 "GUI_MILES": "Miles",
-"GUI_DATA_UPDATED": "data",
+"GUI_DATA_TIMESTAMP": "data",
 // mapping
 "GUI_MAPPING_TOOLS": "Strumenti per la Mappatura",
 "GUI_HIGHLIGHT_UNNAMED_ROADS": "Evidenzia strade senza nome",
diff --git a/WebContent/localization/OSRM.Locale.pl.js b/WebContent/localization/OSRM.Locale.pl.js
index 4aa773d9a..66c2eda71 100644
--- a/WebContent/localization/OSRM.Locale.pl.js
+++ b/WebContent/localization/OSRM.Locale.pl.js
@@ -37,7 +37,7 @@ OSRM.Localization["pl"] = {
 "GUI_UNITS": "Jednostki",
 "GUI_KILOMETERS": "Kilometrów",
 "GUI_MILES": "Miles",
-"GUI_DATA_UPDATED": "data",
+"GUI_DATA_TIMESTAMP": "data",
 // mapping
 "GUI_MAPPING_TOOLS": "Narzędzia mapowania",
 "GUI_HIGHLIGHT_UNNAMED_ROADS": "Zaznacz ulice bez nazwy",
diff --git a/WebContent/main.html b/WebContent/main.html
index af4be1b79..3b32ab10d 100644
--- a/WebContent/main.html
+++ b/WebContent/main.html
@@ -104,10 +104,10 @@ or see http://www.gnu.org/licenses/agpl.txt.
 	</div>
 	</div>
 	
-	<!-- data updated -->
+	<!-- data timestamp -->
 	<div class="full">
 	<div class="row">	
-	<div class="right small-font"><span id="gui-data-updated">data: n/a</span></div>
+	<div class="right small-font"><span id="gui-data-timestamp">data: n/a</span></div>
 	</div>
 	</div>
 </div>