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

Merge and adapt PR #95 car-eco/fast + display energy/time

Browse source
This commit is contained in:
Norbert Renner 2018-01-25 19:05:46 +01:00
commit 102e978581
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config.template.js
View file

@ -19,7 +19,8 @@
BR.conf.profiles = [ BR.conf.profiles = [
'trekking', 'trekking',
'fastbike', 'fastbike',
'car-test', 'car-eco',
'car-fast',
'safety', 'safety',
'shortest', 'shortest',
'trekking-ignore-cr', 'trekking-ignore-cr',
@ -48,7 +49,8 @@
'fastbike', 'fastbike',
'shortest', 'shortest',
'moped', 'moped',
'car-test' 'car-eco',
'car-fast'
]; ];
BR.conf.host = 'http://0.0.0.0:17777'; BR.conf.host = 'http://0.0.0.0:17777';

8
index.html
View file

@ -209,6 +209,14 @@
<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" id="distance">0 <abbr title="kilometer">km</abbr></p>
</li> </li>
<li style="display: inline-block" hidden>
<div class="text-muted small hidden-sm-down">Travel time</div>
<p class="stats-label" id="totaltime">0 <abbr title="minutes">min</abbr></p>
</li>
<li style="display: inline-block" hidden>
<div class="text-muted small hidden-sm-down">Total Energy (per 100km)</div>
<p class="stats-label" id="totalenergy">0 (0)</p>
</li>
<li class="d-inline-block"> <li class="d-inline-block">
<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" id="ascend">0 (0) <abbr title="meter">m</abbr></p>

14
js/control/TrackStats.js
View file

@ -3,11 +3,19 @@ BR.TrackStats = L.Class.extend({
var stats = this.calcStats(polyline, segments), var stats = this.calcStats(polyline, segments),
length1 = L.Util.formatNum(stats.trackLength/1000,1), length1 = L.Util.formatNum(stats.trackLength/1000,1),
length3 = L.Util.formatNum(stats.trackLength/1000,3), length3 = L.Util.formatNum(stats.trackLength/1000,3),
meanCostFactor = stats.trackLength ? L.Util.formatNum(stats.cost / stats.trackLength, 2) : '' meanCostFactor = stats.trackLength ? L.Util.formatNum(stats.cost / stats.trackLength, 2) : '',
formattedTime = L.Util.formatNum(stats.totalTime / 60., 1),
formattedEnergy = L.Util.formatNum(stats.totalEnergy / 3600000., 2),
meanEnergy = stats.trackLength ? L.Util.formatNum(stats.totalEnergy / 36. / stats.trackLength, 2) : '';
$('#distance').html(length1 + ' <abbr title="kilometer">km</abbr>'); $('#distance').html(length1 + ' <abbr title="kilometer">km</abbr>');
$('#ascend').html(stats.filteredAscend + ' (' + stats.plainAscend +')' + ' <abbr title="meter">m</abbr>'); $('#ascend').html(stats.filteredAscend + ' (' + stats.plainAscend +')' + ' <abbr title="meter">m</abbr>');
$('#cost').html(stats.cost + ' (' + meanCostFactor + ')'); $('#cost').html(stats.cost + ' (' + meanCostFactor + ')');
$('#totaltime').html(formattedTime + ' <abbr title="minutes">min</abbr>');
$('#totalenergy').html(formattedEnergy + ' (' + meanEnergy +') kWh');
document.getElementById('totaltime').parentElement.hidden = !stats.totalTime;
document.getElementById('totalenergy').parentElement.hidden = !stats.totalEnergy;
}, },
calcStats: function(polyline, segments) { calcStats: function(polyline, segments) {
@ -15,6 +23,8 @@ BR.TrackStats = L.Class.extend({
trackLength: 0, trackLength: 0,
filteredAscend: 0, filteredAscend: 0,
plainAscend: 0, plainAscend: 0,
totalTime: 0,
totalEnergy: 0,
cost: 0 cost: 0
}; };
var i, props; var i, props;
@ -24,6 +34,8 @@ BR.TrackStats = L.Class.extend({
stats.trackLength += +props['track-length']; stats.trackLength += +props['track-length'];
stats.filteredAscend += +props['filtered ascend']; stats.filteredAscend += +props['filtered ascend'];
stats.plainAscend += +props['plain-ascend']; stats.plainAscend += +props['plain-ascend'];
stats.totalTime += +props['total-time'];
stats.totalEnergy += +props['total-energy'];
stats.cost += +props['cost']; stats.cost += +props['cost'];
} }