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

Cleanup: SegmentStatisticUpdater is always initialized.

Browse Source
This commit is contained in:
Dennis Guse
2025-11-21 16:19:32 +01:00
parent 1ef7a6ecc4
commit 73d6ca6ca6
6 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java
+2 -2
View File
@@ -166,14 +166,14 @@ public class TrackStatisticsUpdaterTest {
assertEquals(Speed.of(2), subject.getTrackStatistics().maxSpeed());
// when
subject.addTrackPoints(List.of(
List.of(
new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(5)),
createTrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(6))
.setSpeed(Speed.of(1f)),
createTrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(7))
.setSpeed(Speed.of(1f)),
new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochSecond(8))
));
).forEach(subject::addTrackPoint);
// then
assertEquals(Speed.of(2f), subject.getTrackStatistics().maxSpeed());
src/main/java/de/dennisguse/opentracks/data/models/Statistics.java
+22 -1
View File
@@ -7,15 +7,20 @@ import java.time.Duration;
import java.time.Instant;
import java.util.Objects;
//TODO Add @NonNull to attributes
public record Statistics(
@NonNull
Instant startTime,
@NonNull
Instant stopTime,
@NonNull
Duration totalDuration,
@NonNull
Duration movingDuration, // Based on when we believe the user is traveling
@NonNull
Distance totalDistance,
@NonNull
Speed maxSpeed,
@Nullable
@@ -31,6 +36,22 @@ public record Statistics(
Power avgPower
) {
//TODO: Should not be necessary; refactor and remove.
@Deprecated
public static final Statistics DEFAULT =
new Statistics(
null,
null,
Duration.ZERO,
Duration.ZERO,
Distance.ZERO,
Speed.ZERO,
null,
null,
null,
null
);
public Duration getStoppedTime() {
return totalDuration.minus(movingDuration);
}
src/main/java/de/dennisguse/opentracks/data/models/Track.java
+2 -1
View File
@@ -24,6 +24,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import java.time.Duration;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.UUID;
@@ -67,7 +68,7 @@ public class Track {
@Deprecated //TODO Remove
public Track(@NonNull ZoneOffset zoneOffset) {
this(zoneOffset, new SegmentStatisticUpdater().getStatistics());
this(zoneOffset, Statistics.DEFAULT);
}
public Track(@NonNull ZoneOffset zoneOffset, @NonNull Statistics trackStatistics) {
src/main/java/de/dennisguse/opentracks/services/RecordingData.java
+1 -1
View File
@@ -23,7 +23,7 @@ public record RecordingData(Track track, TrackPoint latestTrackPoint, SensorData
@NonNull
public Statistics getStatisticsTrack() {
if (track == null) {
return new SegmentStatisticUpdater().getStatistics();
return Statistics.DEFAULT; //TODO Refactor code that this is not necessary.
}
return track.getStatistics();
src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java
+12 -37
View File
@@ -46,9 +46,11 @@ public class SegmentStatisticUpdater {
private final ExtremityMonitor altitudeExtremities = new ExtremityMonitor();
// The track start time.
private Instant startTime; //TODO Should never be null!
@NonNull
private final Instant startTime;
// The track stop time.
private Instant stopTime; //TODO Should never be null!
@NonNull
private Instant stopTime;
private Distance totalDistance;
/**
@@ -67,12 +69,14 @@ public class SegmentStatisticUpdater {
private HeartRate avgHeartRate = null;
private Power avgPower = null;
public SegmentStatisticUpdater() {
reset();
}
public SegmentStatisticUpdater(Instant startTime) {
reset(startTime);
public SegmentStatisticUpdater(@NonNull Instant startTime) {
this.startTime = this.stopTime = startTime;
totalDuration = Duration.ZERO;
movingDuration = Duration.ZERO;
totalDistance = Distance.ZERO;
maxSpeed = Speed.ZERO;
totalAltitudeGain_m = null;
totalAltitudeLoss_m = null;
}
/**
@@ -106,27 +110,6 @@ public class SegmentStatisticUpdater {
return statistics.merge(getStatistics());
}
public boolean isInitialized() {
return startTime != null;
}
public void reset() {
startTime = null;
stopTime = null;
totalDuration = Duration.ZERO;
movingDuration = Duration.ZERO;
totalDistance = Distance.ZERO;
maxSpeed = Speed.ZERO;
totalAltitudeGain_m = null;
totalAltitudeLoss_m = null;
}
public void reset(Instant startTime) {
reset();
setStartTime(startTime);
}
public Statistics getStatistics() {
// Times may not be live (i.e., updated automatically).
return new Statistics(
@@ -146,14 +129,6 @@ public class SegmentStatisticUpdater {
);
}
/**
* Should only be called on start.
*/
public void setStartTime(Instant startTime) {
this.startTime = startTime;
setStopTime(startTime);
}
public void setStopTime(Instant stopTime) {
if (stopTime.isBefore(startTime)) {
// Time must be monotonically increasing, but we might have events at the same point in time (BLE and GPS)
src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java
+9 -15
View File
@@ -32,8 +32,7 @@ import de.dennisguse.opentracks.settings.PreferencesUtils;
/**
* Updater for {@link SegmentStatisticUpdater}.
* For updating track {@link SegmentStatisticUpdater} as new {@link TrackPoint}s are added.
* NOTE: Some of the locations represent pause/resume separator.
* NOTE: Has still support for segments (at the moment unused).
* NOTE: {@link TrackPoint} represent pause/resume separator.
*
* @author Sandor Dornbush
* @author Rodrigo Damazio
@@ -51,7 +50,7 @@ public class TrackStatisticsUpdater {
private Duration totalPowerDuration = Duration.ZERO;
// The current segment's statistics
private final SegmentStatisticUpdater currentSegment;
private SegmentStatisticUpdater currentSegment;
// Current segment's last trackPoint
private TrackPoint lastTrackPoint;
@@ -59,7 +58,7 @@ public class TrackStatisticsUpdater {
@Deprecated
public TrackStatisticsUpdater() {
this(new SegmentStatisticUpdater().getStatistics());
this(Statistics.DEFAULT);
}
public TrackStatisticsUpdater(@NonNull TrackPoint trackPoint) {
@@ -71,12 +70,12 @@ public class TrackStatisticsUpdater {
this();
assert !trackPoints.isEmpty(); //TODO Enforce that this is always true (e.g., import)
addTrackPoints(trackPoints);
trackPoints.forEach(this::addTrackPoint);
}
public TrackStatisticsUpdater(@NonNull Statistics statistics) {
this.statisticsWithoutCurrentSegment = statistics;
this.currentSegment = new SegmentStatisticUpdater();
this.currentSegment = null;
resetAverageHeartRate();
}
@@ -105,17 +104,12 @@ public class TrackStatisticsUpdater {
return currentSegment.getStatistics();
}
public void addTrackPoints(List<TrackPoint> trackPoints) {
trackPoints.forEach(this::addTrackPoint);
}
public void addTrackPoint(TrackPoint trackPoint) {
if (trackPoint.isSegmentManualStart()) {
reset(trackPoint);
}
if (!currentSegment.isInitialized()) {
currentSegment.setStartTime(trackPoint.getTime());
if (currentSegment == null) {
currentSegment = new SegmentStatisticUpdater(trackPoint.getTime());
}
// Always update time
@@ -199,10 +193,10 @@ public class TrackStatisticsUpdater {
}
private void reset(TrackPoint trackPoint) {
if (currentSegment.isInitialized()) {
if (currentSegment != null) {
statisticsWithoutCurrentSegment = currentSegment.merge(statisticsWithoutCurrentSegment);
}
currentSegment.reset(trackPoint.getTime());
currentSegment = new SegmentStatisticUpdater(trackPoint.getTime());
lastTrackPoint = null;
resetAverageHeartRate();