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

Merge pull request #95 from abrensch/v0.6-fixes

Browse source 
car-eco/fast + display energy/time
This commit is contained in:
Norbert Renner 2017-09-29 11:34:39 +02:00 • committed by GitHub
commit 43d5aaa360
2 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config.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://localhost:17777'; BR.conf.host = 'http://localhost:17777';

17
js/control/TrackStats.js
View file

@ -14,14 +14,27 @@ BR.TrackStats = BR.Control.extend({
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) : '',
html = ''; html = '';
html += '<table id="stats">'; html += '<table id="stats">';
html += '<tr><td>Length: </td><td title="' + length3 + ' km">' + length1 + '</td><td>km</td></tr>'; html += '<tr><td>Length: </td><td title="' + length3 + ' km">' + length1 + '</td><td>km</td></tr>';
if ( stats.totalTime )
{
html += '<tr><td>Time:</td><td>' + formattedTime + '</td><td>min</td></tr>';
html += '<tr><td>Energy:</td><td>' + formattedEnergy + '</td><td>kWh</td><td><small>&nbsp;(mean: ' + meanEnergy + ')</small></td></tr>';
html += '<tr><td>Ascent:</td><td>' + stats.filteredAscend + '</td><td>m</td><td><small>&nbsp;(plain: ' + stats.plainAscend + ')</small></td></tr>';
html += '<tr><td>Cost: </td><td>' + stats.cost + '</td><td></td><td><small>&nbsp;(mean: ' + meanCostFactor + ')</small></td></tr>';
}
else
{
html += '<tr><td>Ascent filtered:</td><td>' + stats.filteredAscend + '</td><td>m</td></tr>'; html += '<tr><td>Ascent filtered:</td><td>' + stats.filteredAscend + '</td><td>m</td></tr>';
html += '<tr><td>Ascent plain:</td><td>' + stats.plainAscend + '</td><td>m</td></tr>'; html += '<tr><td>Ascent plain:</td><td>' + stats.plainAscend + '</td><td>m</td></tr>';
html += '<tr><td>Cost: </td><td>' + stats.cost + '</td><td></td></tr>'; html += '<tr><td>Cost: </td><td>' + stats.cost + '</td><td></td></tr>';
html += '<tr><td>Mean cost:</td><td>' + meanCostFactor + '</td><td></td></tr>'; html += '<tr><td>Mean cost:</td><td>' + meanCostFactor + '</td><td></td></tr>';
}
html += '</table>'; html += '</table>';
this._content.innerHTML = html; this._content.innerHTML = html;
@ -32,6 +45,8 @@ BR.TrackStats = BR.Control.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;
@ -41,6 +56,8 @@ BR.TrackStats = BR.Control.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'];
} }