ben/brouter-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Refactor duplicate abbr definitions; add kWh abbr

Browse source
This commit is contained in:
Norbert Renner 2018-01-27 11:13:30 +01:00
parent a5c6e338b6
commit 20959fd287
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
index.html
View file

@ -203,23 +203,23 @@
<ul id="stats"> <ul id="stats">
<li> <li>
<div class="text-muted small hidden-sm-down">Distance</div> <div class="text-muted small hidden-sm-down">Distance</div>
<p class="stats-label" id="distance">0 <abbr title="kilometer">km</abbr></p> <p class="stats-label"><span id="distance">0</span> <abbr title="kilometer">km</abbr></p>
</li> </li>
<li hidden> <li hidden>
<div class="text-muted small hidden-sm-down">Travel time</div> <div class="text-muted small hidden-sm-down">Travel time</div>
<p class="stats-label" id="totaltime">0 <abbr title="minutes">min</abbr></p> <p class="stats-label"><span id="totaltime">0</span> <abbr title="minutes">min</abbr></p>
</li> </li>
<li hidden> <li hidden>
<div class="text-muted small hidden-sm-down">Total Energy (per 100km)</div> <div class="text-muted small hidden-sm-down">Total Energy (per 100km)</div>
<p class="stats-label" id="totalenergy">0 (0)</p> <p class="stats-label"><span id="totalenergy">0 (0)</span> <abbr title="kilowatt hour">kWh</abbr></p>
</li> </li>
<li> <li>
<div class="text-muted small hidden-sm-down">Ascend (Plain ascend)</div> <div class="text-muted small hidden-sm-down">Ascend (Plain ascend)</div>
<p class="stats-label" id="ascend">0 (0) <abbr title="meter">m</abbr></p> <p class="stats-label"><span id="ascend">0 (0)</span> <abbr title="meter">m</abbr></p>
</li> </li>
<li> <li>
<div class="text-muted small hidden-sm-down">Cost (Mean cost factor)</div> <div class="text-muted small hidden-sm-down">Cost (Mean cost factor)</div>
<p class="stats-label" id="cost">- (-)</p> <p class="stats-label"><span id="cost">- (-)</span></p>
</li> </li>
</ul> </ul>
<button id="sidebar-btn" class="btn btn-secondary btn-sm" type="button" aria-label="Toggle sidebar"> <button id="sidebar-btn" class="btn btn-secondary btn-sm" type="button" aria-label="Toggle sidebar">

12
js/control/TrackStats.js
View file

@ -8,14 +8,14 @@ BR.TrackStats = L.Class.extend({
formattedEnergy = L.Util.formatNum(stats.totalEnergy / 3600000., 2), formattedEnergy = L.Util.formatNum(stats.totalEnergy / 3600000., 2),
meanEnergy = stats.trackLength ? L.Util.formatNum(stats.totalEnergy / 36. / stats.trackLength, 2) : ''; meanEnergy = stats.trackLength ? L.Util.formatNum(stats.totalEnergy / 36. / stats.trackLength, 2) : '';
$('#distance').html(length1 + ' <abbr title="kilometer">km</abbr>'); $('#distance').html(length1);
$('#ascend').html(stats.filteredAscend + ' (' + stats.plainAscend +')' + ' <abbr title="meter">m</abbr>'); $('#ascend').html(stats.filteredAscend + ' (' + stats.plainAscend +')');
$('#cost').html(stats.cost + ' (' + meanCostFactor + ')'); $('#cost').html(stats.cost + ' (' + meanCostFactor + ')');
$('#totaltime').html(formattedTime + ' <abbr title="minutes">min</abbr>'); $('#totaltime').html(formattedTime);
$('#totalenergy').html(formattedEnergy + ' (' + meanEnergy +') kWh'); $('#totalenergy').html(formattedEnergy + ' (' + meanEnergy +')');
document.getElementById('totaltime').parentElement.hidden = !stats.totalTime; document.getElementById('totaltime').parentElement.parentElement.hidden = !stats.totalTime;
document.getElementById('totalenergy').parentElement.hidden = !stats.totalEnergy; document.getElementById('totalenergy').parentElement.parentElement.hidden = !stats.totalEnergy;
}, },
calcStats: function(polyline, segments) { calcStats: function(polyline, segments) {