KMZ/KML: Export/Import SENSORPOINTs.

Part of #500.

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

@@ -36,9 +36,11 @@ class TrackRecordingManager {
     private Track.Id trackId;
     private TrackStatisticsUpdater trackStatisticsUpdater;
 
+    //TDOO use lastStoredTrackPoint?
     private boolean currentSegmentHasTrackPoint;
     private TrackPoint lastTrackPoint;
     private TrackPoint lastStoredTrackPoint;
+    private TrackPoint lastStoredTrackPointWithLocation;
 
     TrackRecordingManager(Context context) {
         this.context = context;
@@ -80,15 +82,20 @@ class TrackRecordingManager {
 
         trackStatisticsUpdater = new TrackStatisticsUpdater(track.getTrackStatistics());
         insertTrackPoint(trackId, segmentStartTrackPoint);
-        currentSegmentHasTrackPoint = false;
-        lastTrackPoint = null;
-        lastStoredTrackPoint = null;    }
 
-    void pause(TrackPointCreator trackPointCreator) {
-        insertTrackPoint(trackId, trackPointCreator.createSegmentEnd());
         currentSegmentHasTrackPoint = false;
         lastTrackPoint = null;
         lastStoredTrackPoint = null;
+        lastStoredTrackPointWithLocation = null;
+    }
+
+    void pause(TrackPointCreator trackPointCreator) {
+        insertTrackPoint(trackId, trackPointCreator.createSegmentEnd());
+
+        currentSegmentHasTrackPoint = false;
+        lastTrackPoint = null;
+        lastStoredTrackPoint = null;
+        lastStoredTrackPointWithLocation = null;
     }
 
     void end(TrackPointCreator trackPointCreator) {
@@ -97,9 +104,11 @@ class TrackRecordingManager {
 
         trackId = null;
         trackStatisticsUpdater = null;
+
+        currentSegmentHasTrackPoint = false;
         lastTrackPoint = null;
         lastStoredTrackPoint = null;
-        currentSegmentHasTrackPoint = false;
+        lastStoredTrackPointWithLocation = null;
     }
 
     Pair<Track, Pair<TrackPoint, SensorDataSet>> get(TrackPointCreator trackPointCreator) {
@@ -131,7 +140,7 @@ class TrackRecordingManager {
             name = context.getString(R.string.marker_name_format, nextMarkerNumber + 1);
         }
 
-        if (lastStoredTrackPoint == null) {
+        if (lastStoredTrackPointWithLocation == null) {
             Log.i(TAG, "Could not create a marker as trackPoint is unknown.");
             return null;
         }
@@ -160,18 +169,31 @@ class TrackRecordingManager {
             return true;
         }
 
-        Distance distanceToLastTrackLocation = trackPoint.distanceToPrevious(lastStoredTrackPoint);
-        if (distanceToLastTrackLocation != null) {
-            if (distanceToLastTrackLocation.greaterThan(maxRecordingDistance)) {
+        Distance distanceToLastStoredTrackPoint = trackPoint.distanceToPrevious(lastStoredTrackPoint);
+        if (distanceToLastStoredTrackPoint != null) {
+            if (distanceToLastStoredTrackPoint.greaterThan(maxRecordingDistance)) {
                 trackPoint.setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
                 insertTrackPoint(trackId, trackPoint);
                 return true;
             }
 
-            if (distanceToLastTrackLocation.greaterOrEqualThan(recordingDistanceInterval) && trackPoint.isMoving()) {
+            if (distanceToLastStoredTrackPoint.greaterOrEqualThan(recordingDistanceInterval) && trackPoint.isMoving()) {
                 insertTrackPoint(trackId, trackPoint);
                 return true;
             }
+
+            if (trackPoint.hasLocation()) {
+                if (lastStoredTrackPointWithLocation == null) {
+                    insertTrackPoint(trackId, trackPoint);
+                    return true;
+                }
+
+                Distance distanceToLastStoredTrackPointWithLocation = trackPoint.distanceToPrevious(lastStoredTrackPointWithLocation);
+                if (distanceToLastStoredTrackPointWithLocation != null && distanceToLastStoredTrackPointWithLocation.greaterOrEqualThan(recordingDistanceInterval)) {
+                    insertTrackPoint(trackId, trackPoint);
+                    return true;
+                }
+            }
         }
 
         if (lastStoredTrackPoint != null && trackPoint.isMoving() != lastStoredTrackPoint.isMoving()) {
@@ -212,6 +234,9 @@ class TrackRecordingManager {
 
             contentProviderUtils.updateTrackStatistics(trackId, trackStatisticsUpdater.getTrackStatistics());
             lastStoredTrackPoint = trackPoint;
+            if (trackPoint.hasLocation()) {
+                lastStoredTrackPointWithLocation = lastStoredTrackPoint;
+            }
         } catch (SQLiteException e) {
             /*
              * Insert failed, most likely because of SqlLite error code 5 (SQLite_BUSY).

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

@@ -318,7 +318,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
      * @param trackStopped true if track is stopped, false if track is paused
      */
     private void endRecording(boolean trackStopped) {
-        handler.removeCallbacks(updateRecordingData);
+        stopUpdateRecordingData();
         if (!trackStopped) {
             updateRecordingDataWhileRecording();
         } else {
@@ -458,6 +458,11 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         recordingDataObservable.postValue(new RecordingData(data.first, trackPoint, data.second.second));
     }
 
+    @VisibleForTesting
+    public void stopUpdateRecordingData() {
+        handler.removeCallbacks(updateRecordingData);
+    }
+
     public LiveData<RecordingStatus> getRecordingStatusObservable() {
         return recordingStatusObservable;
     }

src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java

@@ -152,6 +152,11 @@ public class TrackPointCreator {
         return Instant.now(clock);
     }
 
+    @VisibleForTesting
+    public AltitudeSumManager getAltitudeSumManager() {
+        return altitudeSumManager;
+    }
+
     @Deprecated
     @VisibleForTesting
     public void setAltitudeSumManager(AltitudeSumManager altitudeSumManager) {

src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java

@@ -65,29 +65,38 @@ public class AltitudeSumManager implements SensorEventListener {
         trackPoint.setAltitudeLoss(altitudeLoss_m);
     }
 
-    public @Nullable
-    Float getAltitudeGain_m() {
+    @Nullable
+    public Float getAltitudeGain_m() {
         return isConnected ? altitudeGain_m : null;
     }
 
+    @VisibleForTesting
+    public void setAltitudeGain_m(float altitudeGain_m) {
+        this.altitudeGain_m = altitudeGain_m;
+    }
 
     @VisibleForTesting
     public void addAltitudeGain_m(float altitudeGain_m) {
         this.altitudeGain_m = this.altitudeGain_m == null ? 0f : this.altitudeGain_m;
-        this.altitudeGain_m += altitudeGain_m ;
+        this.altitudeGain_m += altitudeGain_m;
     }
 
     @VisibleForTesting
     public void addAltitudeLoss_m(Float altitudeLoss_m) {
         this.altitudeLoss_m = this.altitudeLoss_m == null ? 0f : this.altitudeLoss_m;
-        this.altitudeLoss_m += altitudeLoss_m ;
+        this.altitudeLoss_m += altitudeLoss_m;
     }
 
-    public @Nullable
-    Float getAltitudeLoss_m() {
+    @Nullable
+    public Float getAltitudeLoss_m() {
         return isConnected ? altitudeLoss_m : null;
     }
 
+    @VisibleForTesting
+    public void setAltitudeLoss_m(float altitudeLoss_m) {
+        this.altitudeLoss_m = altitudeLoss_m;
+    }
+
     public void reset() {
         Log.d(TAG, "Reset");
         altitudeGain_m = null;