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

TrackRecordingManager: cleanup.

Browse Source
This commit is contained in:
Dennis Guse
2021-10-07 21:30:19 +02:00
parent d97e5ab1ef
commit 24826ff442
2 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
+13 -35
View File
@@ -86,18 +86,11 @@ class TrackRecordingManager {
}
void pause(TrackPointCreator trackPointCreator) {
if (lastTrackPoint != null) {
insertTrackPointIfNewer(trackId, lastTrackPoint);
}
insertTrackPoint(trackId, trackPointCreator.createSegmentEnd());
currentSegmentHasTrackPoint = false;
}
void end(TrackPointCreator trackPointCreator) {
if (lastTrackPoint != null) {
insertTrackPointIfNewer(trackId, lastTrackPoint);
}
TrackPoint segmentEnd = trackPointCreator.createSegmentEnd();
insertTrackPoint(trackId, segmentEnd);
@@ -156,65 +149,51 @@ class TrackRecordingManager {
return new Marker.Id(ContentUris.parseId(uri));
}
boolean onNewTrackPoint(TrackPoint trackPoint, Distance thresholdHorizontalAccuracy) {
boolean onNewTrackPoint(TrackPoint trackPoint) {
//TODO Figure out how to avoid loading the lastValidTrackPoint from the database
TrackPoint lastValidTrackPoint = getLastValidTrackPointInCurrentSegment(trackId);
//Storing trackPoint
// Always insert the first segment location
if (!currentSegmentHasTrackPoint) {
insertTrackPoint(trackId, trackPoint);
currentSegmentHasTrackPoint = true;
lastTrackPoint = null;
return true;
}
Distance distanceToLastTrackLocation = trackPoint.distanceToPrevious(lastValidTrackPoint);
if (distanceToLastTrackLocation != null) {
if (distanceToLastTrackLocation.greaterThan(maxRecordingDistance)) {
insertTrackPointIfNewer(trackId, lastTrackPoint);
trackPoint.setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
insertTrackPoint(trackId, trackPoint);
isIdle = false;
lastTrackPoint = null;
return true;
}
if (trackPoint.hasSensorData() || distanceToLastTrackLocation.greaterOrEqualThan(recordingDistanceInterval)) {
insertTrackPointIfNewer(trackId, lastTrackPoint);
insertTrackPoint(trackId, trackPoint);
isIdle = false;
lastTrackPoint = null;
return true;
}
}
if (!isIdle && !trackPoint.isMoving()) {
insertTrackPointIfNewer(trackId, lastTrackPoint);
insertTrackPoint(trackId, trackPoint);
isIdle = true;
lastTrackPoint = null;
return true;
}
if (isIdle && trackPoint.isMoving()) {
insertTrackPointIfNewer(trackId, lastTrackPoint);
insertTrackPoint(trackId, trackPoint);
isIdle = false;
lastTrackPoint = null;
return true;
}
@@ -253,23 +232,22 @@ class TrackRecordingManager {
return contentProviderUtils.getLastValidTrackPoint(trackId);
}
/**
* Inserts a trackPoint if this trackPoint is different than lastValidTrackPoint.
*/
private void insertTrackPointIfNewer(@NonNull Track.Id trackId, @Nullable TrackPoint trackPoint) {
if (trackPoint == null) return;
TrackPoint lastValidTrackPoint = getLastValidTrackPointInCurrentSegment(trackId);
if (lastValidTrackPoint != null && trackPoint.getTime().equals(lastValidTrackPoint.getTime())) {
// Do not insert if inserted already
Log.w(TAG, "Ignore insertTrackPoint. trackPoint time same as last valid trackId point time.");
return;
private void insertTrackPoint(@NonNull Track.Id trackId, @NonNull TrackPoint trackPoint) {
if (lastTrackPoint != null) {
TrackPoint lastValidTrackPoint = getLastValidTrackPointInCurrentSegment(trackId);
if (lastValidTrackPoint != null && lastTrackPoint.getTime().equals(lastValidTrackPoint.getTime())) {
// Do not insert if inserted already
Log.w(TAG, "Ignore insertTrackPoint. trackPoint time same as last valid trackId point time.");
} else {
insertTrackPointHelper(trackId, lastTrackPoint);
}
lastTrackPoint = null;
}
insertTrackPoint(trackId, trackPoint);
insertTrackPointHelper(trackId, trackPoint);
}
private void insertTrackPoint(@NonNull Track.Id trackId, @NonNull TrackPoint trackPoint) {
private void insertTrackPointHelper(@NonNull Track.Id trackId, @NonNull TrackPoint trackPoint) {
try {
contentProviderUtils.insertTrackPoint(trackPoint, trackId);
trackStatisticsUpdater.addTrackPoint(trackPoint, recordingDistanceInterval);
src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+1 -1
View File
@@ -362,7 +362,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
}
notificationManager.updateTrackPoint(this, trackRecordingManager.getTrackStatistics(), trackPoint, thresholdHorizontalAccuracy);
return trackRecordingManager.onNewTrackPoint(trackPoint, thresholdHorizontalAccuracy);
return trackRecordingManager.onNewTrackPoint(trackPoint);
}
@Override