cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'openstreetmap/pull/1437'

Browse source
This commit is contained in:
Tom Hughes 2017-03-05 10:34:23 +00:00
commit b954416a70
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/index/directions.js
View file

@ -207,8 +207,13 @@ OSM.Directions = function (map) {
'<span class="icon close"></span></a>' + I18n.t('javascripts.directions.directions') +
'</h2><p id="routing_summary">' +
I18n.t('javascripts.directions.distance') + ': ' + formatDistance(route.distance) + '. ' +
I18n.t('javascripts.directions.time') + ': ' + formatTime(route.time) + '.</p>' +
'<table id="turnbyturn" />';
I18n.t('javascripts.directions.time') + ': ' + formatTime(route.time) + '.';
if (typeof route.ascend !== 'undefined' && typeof route.descend !== 'undefined') {
html += '<br />' +
I18n.t('javascripts.directions.ascend') + ': ' + Math.round(route.ascend) + 'm. ' +
I18n.t('javascripts.directions.descend') + ': ' + Math.round(route.descend) +'m.';
}
html += '</p><table id="turnbyturn" />';
$('#sidebar_content')
.html(html);

4
app/assets/javascripts/index/directions/graphhopper.js
View file

@ -66,7 +66,9 @@ function GraphHopperEngine(id, vehicleType) {
line: line,
steps: steps,
distance: path.distance,
time: path.time / 1000
time: path.time / 1000,
ascend: path.ascend,
descend: path.descend
});
},
error: function () {