karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Simplify construction of TrackStatisticsUpdater.

Browse Source
This commit is contained in:
Dennis Guse
2025-11-20 18:07:32 +01:00
parent 4ebaf366d6
commit 94a0b57362
9 changed files with 84 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java
+13 -8
View File
@@ -17,7 +17,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
public class IntervalStatisticsUpdater {
private TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater();
private TrackStatisticsUpdater trackStatisticsUpdater;
private final List<Interval> intervalList;
private final Distance distanceInterval;
private Interval interval, lastInterval;
@@ -45,7 +45,11 @@ public class IntervalStatisticsUpdater {
while (trackPointIterator.hasNext()) {
trackPoint = trackPointIterator.next();
trackStatisticsUpdater.addTrackPoint(trackPoint);
if (trackStatisticsUpdater == null) {
trackStatisticsUpdater = new TrackStatisticsUpdater(trackPoint);
} else {
trackStatisticsUpdater.addTrackPoint(trackPoint);
}
if (trackStatisticsUpdater.getTrackStatistics().totalDistance().plus(interval.distance).greaterOrEqualThan(distanceInterval)) {
interval.add(trackStatisticsUpdater.getTrackStatistics(), trackPoint);
@@ -56,8 +60,7 @@ public class IntervalStatisticsUpdater {
intervalList.set(intervalList.size() - 1, adjustedInterval);
interval = new Interval(interval.distance.minus(adjustedInterval.distance), interval.time.minus(adjustedInterval.time));
trackStatisticsUpdater = new TrackStatisticsUpdater();
trackStatisticsUpdater.addTrackPoint(trackPoint);
trackStatisticsUpdater = new TrackStatisticsUpdater(trackPoint);
lastInterval = new Interval(interval);
intervalList.add(lastInterval);
@@ -66,10 +69,12 @@ public class IntervalStatisticsUpdater {
}
}
if (newIntervalAdded) {
lastInterval.add(trackStatisticsUpdater.getTrackStatistics(), null);
} else {
lastInterval.set(trackStatisticsUpdater.getTrackStatistics());
if (trackStatisticsUpdater != null) {
if (newIntervalAdded) {
lastInterval.add(trackStatisticsUpdater.getTrackStatistics(), null);
} else {
lastInterval.set(trackStatisticsUpdater.getTrackStatistics());
}
}
return trackPoint != null ? trackPoint.getId() : null;