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

data_updated -> data_timestamp

Browse Source
This commit is contained in:
DennisSchiefer 2012-05-14 17:50:17 +01:00
parent 9e5689858e
commit e706a9867d
11 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WebContent/OSRM.config.js
View File

@ -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 #

2
WebContent/base/OSRM.HistoryRoutes.js
View File

@ -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 = [];

14
WebContent/gui/OSRM.MainGUI.js
View File

@ -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;
}
});

2
WebContent/localization/OSRM.Locale.de.js
View File

@ -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",

2
WebContent/localization/OSRM.Locale.dk.js
View File

@ -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",

2
WebContent/localization/OSRM.Locale.en.js
View File

@ -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",

2
WebContent/localization/OSRM.Locale.fi.js
View File

@ -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",

2
WebContent/localization/OSRM.Locale.fr.js
View File

@ -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",

2
WebContent/localization/OSRM.Locale.it.js
View File

@ -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",

2
WebContent/localization/OSRM.Locale.pl.js
View File

@ -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",

4
WebContent/main.html
View File

@ -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>