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

Cleanup: TrackDataHub doesn't need to query the id of the last TrackPoint.

Browse Source
This commit is contained in:
Dennis Guse
2025-11-25 18:46:20 +01:00
parent 5cd639c852
commit 7ddb6b32bb
4 changed files with 23 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java
+4 -12
View File
@@ -321,10 +321,6 @@ public class TrackDataHub {
return;
}
TrackPoint.Id lastTrackPointId = contentProviderUtils.getLastTrackPointId(selectedTrackId);
int samplingFrequency = -1;
TrackPoint.Id next = null;
if (localLastSeenTrackPointIdId != null) {
next = new TrackPoint.Id(localLastSeenTrackPointIdId.id() + 1); //TODO startTrackPointId + 1 is an assumption assumption; should be derived from the DB.
@@ -332,9 +328,10 @@ public class TrackDataHub {
TrackPoint trackPoint = null;
try (AutoCloseableIterator<TrackPoint> trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(selectedTrackId, next)) {
long numTotalPoints = trackPointIterator.getCount();
int samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints);
while (trackPointIterator.hasNext()) {
if (!isStarted()) {
return;
}
@@ -353,20 +350,15 @@ public class TrackDataHub {
localFirstSeenTrackPointId = trackPointId;
}
if (samplingFrequency == -1) {
long numTotalPoints = Math.max(0L, lastTrackPointId.id() - localFirstSeenTrackPointId.id()); //TODO That is an assumption; should be derived from the DB.
samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints);
}
if (trackStatisticsUpdater == null) {
trackStatisticsUpdater = new TrackStatisticsUpdater(trackPoint);
} else {
} else {
trackStatisticsUpdater.addTrackPoint(trackPoint);
}
Statistics statistics = trackStatisticsUpdater.getTrackStatistics();
// Also include the last point if the selected track is not recording.
if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) {
if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (!trackPointIterator.hasNext() && !isSelectedTrackRecording())) {
for (Listener trackDataListener : listeners)
trackDataListener.onSampledInTrackPoint(trackPoint, statistics);
}