diff --git a/config.js b/config.js index b0eb1ad..a33479d 100644 --- a/config.js +++ b/config.js @@ -19,7 +19,8 @@ BR.conf.profiles = [ 'trekking', 'fastbike', - 'car-test', + 'car-eco', + 'car-fast', 'safety', 'shortest', 'trekking-ignore-cr', @@ -48,7 +49,8 @@ 'fastbike', 'shortest', 'moped', - 'car-test' + 'car-eco', + 'car-fast' ]; BR.conf.host = 'http://localhost:17777'; diff --git a/js/control/TrackStats.js b/js/control/TrackStats.js index 34f5c79..784925d 100644 --- a/js/control/TrackStats.js +++ b/js/control/TrackStats.js @@ -14,14 +14,27 @@ BR.TrackStats = BR.Control.extend({ length1 = L.Util.formatNum(stats.trackLength/1000,1), length3 = L.Util.formatNum(stats.trackLength/1000,3), 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 += '
| Length: | ' + length1 + ' | km | |
| Ascent filtered: | ' + stats.filteredAscend + ' | m | |
| Ascent plain: | ' + stats.plainAscend + ' | m | |
| Cost: | ' + stats.cost + ' | ||
| Mean cost: | ' + meanCostFactor + ' | ||
| Time: | ' + formattedTime + ' | min | |
| Energy: | ' + formattedEnergy + ' | kWh | (mean: ' + meanEnergy + ') |
| Ascent: | ' + stats.filteredAscend + ' | m | (plain: ' + stats.plainAscend + ') |
| Cost: | ' + stats.cost + ' | (mean: ' + meanCostFactor + ') | |
| Ascent filtered: | ' + stats.filteredAscend + ' | m | |
| Ascent plain: | ' + stats.plainAscend + ' | m | |
| Cost: | ' + stats.cost + ' | ||
| Mean cost: | ' + meanCostFactor + ' |