upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-03 09:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Idle: move idle into TrackStatistics.

Browse Source
This commit is contained in:
Dennis Guse
2023-08-25 23:28:25 +02:00
parent 348cb16256
commit 9a50d7bedf
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java
+3 -7
View File
@@ -49,8 +49,6 @@ public class TrackStatisticsUpdater {
// Current segment's last trackPoint
private TrackPoint lastTrackPoint;
private boolean idle;
public TrackStatisticsUpdater() {
this(new TrackStatistics());
}
@@ -72,7 +70,6 @@ public class TrackStatisticsUpdater {
this.trackStatistics = new TrackStatistics(toCopy.trackStatistics);
this.lastTrackPoint = toCopy.lastTrackPoint;
this.idle = toCopy.idle;
resetAverageHeartRate();
}
@@ -140,18 +137,18 @@ public class TrackStatisticsUpdater {
movingDistance = trackPoint.distanceToPrevious(lastTrackPoint);
}
if (movingDistance != null) {
idle = false;
currentSegment.setIdle(false);
currentSegment.addTotalDistance(movingDistance);
}
if (!idle && !trackPoint.isSegmentManualStart()) {
if (!currentSegment.isIdle() && !trackPoint.isSegmentManualStart()) {
if (lastTrackPoint != null) {
currentSegment.addMovingTime(trackPoint, lastTrackPoint);
}
}
if (trackPoint.getType() == TrackPoint.Type.IDLE) {
idle = true;
currentSegment.setIdle(true);
}
if (trackPoint.hasSpeed()) {
@@ -174,7 +171,6 @@ public class TrackStatisticsUpdater {
currentSegment.reset(trackPoint.getTime());
lastTrackPoint = null;
idle = false;
resetAverageHeartRate();
}