From fe96c75006d2dbf27cd3b67df3581dc9a7fecf91 Mon Sep 17 00:00:00 2001
From: Daniel Dakhno <dakhnod@gmail.com>
Date: Fri, 5 Jul 2024 02:58:25 +0200
Subject: [PATCH] Device Cycling sensor: improved cycling data display

---
 .../charts/CyclingChartFragment.java          | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CyclingChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CyclingChartFragment.java
index 0d07b5c45..556f2475d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CyclingChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CyclingChartFragment.java
@@ -116,21 +116,28 @@ public class CyclingChartFragment extends AbstractChartFragment<CyclingChartFrag
             }
 
             int nextIndex = 0;
+            CyclingSample oldSample = null;
             for (CyclingSample sample : samples) {
                 // add distance in Km
                 distanceEntries.add(new Entry(sample.getTimestamp(), (sample.getDistance() / 1000f) - dayStart));
-                Float speed = sample.getSpeed();
-                speedEntries.add(new Entry(sample.getTimestamp(), (speed != null) ? (sample.getSpeed() * 3.6f) : 0));
 
-                if(nextIndex < samples.size()){
-                    CyclingSample nextSample = samples.get(nextIndex);
-                    if(nextSample.getSpeed() == null){
-                        // sensor is off, doesn't report zero speed. So let's inject it outselves
-                        speedEntries.add(new Entry(sample.getTimestamp() + 30_000, 0));
+                if(oldSample != null) {
+                    float deltaMeters = sample.getDistance() - oldSample.getDistance();
+                    float deltaMillis = sample.getTimestamp() - oldSample.getTimestamp();
+
+                    float metersPerMillisecond = deltaMeters / deltaMillis;
+                    float kmh = metersPerMillisecond * 3600;
+
+                    // Float speed = sample.getSpeed();
+                    if(kmh < 6.0) {
+                        // speed to slow, cutting down to 0
+                        speedEntries.add(new Entry(oldSample.getTimestamp() + 30_000, 0));
                     }
+                    speedEntries.add(new Entry(sample.getTimestamp(), kmh));
                 }
 
                 nextIndex++;
+                oldSample = sample;
             }
 
             LineDataSet distanceSet = new LineDataSet(distanceEntries, "Cycling");