Use distance from cycling speed sensors.

Fixes #505.
2021-02-03 19:50:23 +01:00
parent 15fbd90ca4
commit a5158a55d9
28 changed files with 502 additions and 202 deletions
@@ -57,6 +57,7 @@ public class TrackPoint {
    private Double altitude_m;
    private Float speed_mps;
    private Float bearing;
+    private Float sensorDistance_m;

    public enum Type {
        SEGMENT_START_MANUAL(-2), //Start of a segment due to user interaction (start, resume)
@@ -224,7 +225,7 @@ public class TrackPoint {
        return elevationGain != null;
    }

-    public Float getElevationGain() {
+    public float getElevationGain() {
        return elevationGain;
    }

@@ -310,8 +311,12 @@ public class TrackPoint {
        this.accuracy = horizontalAccuracy;
    }

-    public float distanceTo(@NonNull TrackPoint dest) {
-        return getLocation().distanceTo(dest.getLocation());
+    public float distanceToPrevious(@NonNull TrackPoint previous) {
+        if (hasSensorDistance()) {
+            return getSensorDistance();
+        }
+
+        return getLocation().distanceTo(previous.getLocation());
    }

    public boolean fulfillsAccuracy(int poorAccuracy) {
@@ -327,6 +332,18 @@ public class TrackPoint {
    }

    // Sensor data
+    public boolean hasSensorDistance() {
+        return sensorDistance_m != null;
+    }
+
+    public Float getSensorDistance() {
+        return sensorDistance_m;
+    }
+
+    public void setSensorDistance(Float distance_m) {
+        this.sensorDistance_m = distance_m;
+    }
+
    public boolean hasSensorData() {
        return hasHeartRate() || hasCyclingCadence() || hasPower();
    }
@@ -347,7 +364,7 @@ public class TrackPoint {
        return cyclingCadence_rpm != null;
    }

-    public Float getCyclingCadence_rpm() {
+    public float getCyclingCadence_rpm() {
        return cyclingCadence_rpm;
    }

@@ -359,7 +376,7 @@ public class TrackPoint {
        return power != null;
    }

-    public Float getPower() {
+    public float getPower() {
        return power;
    }

@@ -50,6 +50,7 @@ public interface TrackPointsColumns extends BaseColumns {
    String BEARING = "bearing";
    String SENSOR_HEARTRATE = "sensor_heartrate";
    String SENSOR_CADENCE = "sensor_cadence";
+    String SENSOR_DISTANCE = "sensor_distance"; //DISTANCE from previous TrackPoint
    String SENSOR_POWER = "sensor_power";
    String ELEVATION_GAIN = "elevation_gain";
    String ELEVATION_LOSS = "elevation_loss";
@@ -77,6 +78,7 @@ public interface TrackPointsColumns extends BaseColumns {
            + ELEVATION_GAIN + " FLOAT, "
            + ELEVATION_LOSS + " FLOAT, "
            + TYPE + " TEXT CHECK(type IN (-2, -1, 0, 1)), "
+            + SENSOR_DISTANCE + " FLOAT, "
            + "FOREIGN KEY (" + TRACKID + ") REFERENCES " + TracksColumns.TABLE_NAME + "(" + TracksColumns._ID + ") ON UPDATE CASCADE ON DELETE CASCADE"
            + ")";