TrackRecordingManager: store GPS-based TrackPoints based upon the distance to the previously stored GPS-based TrackPoint.

src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java

@@ -324,6 +324,11 @@ public class TrackPoint {
         if (hasSensorDistance()) {
             return getSensorDistance();
         }
+        return distanceToPreviousFromLocation(previous);
+    }
+
+    @NonNull
+    public Distance distanceToPreviousFromLocation(@NonNull TrackPoint previous) {
         if (!hasLocation() || hasLocation() != previous.hasLocation()) {
             throw new RuntimeException("Cannot compute distance.");
         }

src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java

@@ -171,12 +171,14 @@ class TrackRecordingManager {
             Log.d(TAG, "Ignoring TrackPoint as it has no distance.");
             return false;
         }
-        TrackPoint distanceTo = lastStoredTrackPoint;
+
+        Distance distanceToLastStoredTrackPoint;
         if (trackPoint.hasLocation() && !lastStoredTrackPoint.hasLocation()) {
-            distanceTo = lastStoredTrackPointWithLocation;
+            distanceToLastStoredTrackPoint = trackPoint.distanceToPreviousFromLocation(lastStoredTrackPointWithLocation);
+        } else {
+            distanceToLastStoredTrackPoint = trackPoint.distanceToPrevious(lastStoredTrackPoint);
         }
 
-        Distance distanceToLastStoredTrackPoint = trackPoint.distanceToPrevious(distanceTo);
         if (distanceToLastStoredTrackPoint.greaterThan(maxRecordingDistance)) {
             trackPoint.setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
             insertTrackPoint(trackPoint);