From 7df625ff0c5504e37afd372bf9c1a458a96ee8b6 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Mon, 20 Jan 2025 07:53:45 +0100
Subject: [PATCH] Revert "Bugfix: on idle detection reset movement-based sensor
 data."

This reverts commit fd9646bb1f052ca54b534348df2478a581056e9c.
---
 .../dennisguse/opentracks/sensors/sensorData/Aggregator.java | 4 +---
 .../opentracks/sensors/sensorData/AggregatorBarometer.java   | 5 +++++
 .../opentracks/sensors/sensorData/AggregatorGPS.java         | 5 +++++
 .../opentracks/sensors/sensorData/AggregatorHeartRate.java   | 5 -----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java
index 06e4c1b893..0ffe9c2ef9 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java
@@ -55,9 +55,7 @@ public Output getValue(Instant now) {
     /**
      * Reset long term aggregated values (more than derived from previous SensorData). e.g. overall distance.
      */
-    public void reset() {
-        value = getNoneValue();
-    }
+    public void reset() {}
 
     /**
      * Is the data recent considering the current time.
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorBarometer.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorBarometer.java
index 4717c107c9..06f9fbb7e7 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorBarometer.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorBarometer.java
@@ -37,5 +37,10 @@ protected AltitudeGainLoss getNoneValue() {
         return new AltitudeGainLoss(0f, 0f);
     }
 
+    @Override
+    public void reset() {
+        value = getNoneValue();
+    }
+
     public record Data(Altitude gain, Altitude loss) {}
 }
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java
index feb9ff7f99..5e8acaa6d9 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorGPS.java
@@ -16,6 +16,11 @@ protected void computeValue(Raw<Position> current) {
         value = current.value();
     }
 
+    @Override
+    public void reset() {
+        value = null;
+    }
+
     @NonNull
     @Override
     protected Position getNoneValue() {
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java
index 90d5a9f1fb..9bc470c877 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java
@@ -15,11 +15,6 @@ protected void computeValue(Raw<HeartRate> current) {
         this.value = current.value();
     }
 
-    @Override
-    public void reset() {
-        // We don't need to reset the heart rate as this value is valid for a certain amount of time: and it is not an aggregate.
-    }
-
     @NonNull
     @Override
     protected HeartRate getNoneValue() {