Remove UnitConversions for time/durations.

src/main/java/de/dennisguse/opentracks/data/models/Cadence.java

@@ -2,22 +2,35 @@ package de.dennisguse.opentracks.data.models;
 
 import androidx.annotation.NonNull;
 
+import java.time.Duration;
 import java.util.Objects;
 
 public class Cadence {
 
-    public static Cadence of(float value) {
-        return new Cadence(value);
+    public static Cadence of(float value, Duration duration) {
+        if (duration.isZero()) {
+            return zero();
+        }
+
+        return new Cadence(value / (duration.toMillis() / (float) Duration.ofMinutes(1).toMillis()));
     }
 
-    private final float value;
+    public static Cadence of(float value_rpm) {
+        return new Cadence(value_rpm);
+    }
+
+    public static Cadence zero() {
+        return of(0.0f);
+    }
+
+    private final float value_rpm;
 
     private Cadence(float value) {
-        this.value = value;
+        this.value_rpm = value;
     }
 
     public float getRPM() {
-        return value;
+        return value_rpm;
     }
 
     @Override
@@ -25,19 +38,19 @@ public class Cadence {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         Cadence cadence = (Cadence) o;
-        return Float.compare(cadence.value, value) == 0;
+        return Float.compare(cadence.value_rpm, value_rpm) == 0;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(value);
+        return Objects.hash(value_rpm);
     }
 
     @NonNull
     @Override
     public String toString() {
         return "Cadence{" +
-                "value=" + value + " rpm" +
+                "value=" + value_rpm + " rpm" +
                 '}';
     }
 }

src/main/java/de/dennisguse/opentracks/data/models/Speed.java

@@ -15,7 +15,7 @@ public class Speed {
             return zero();
         }
 
-        return new Speed(distance.toM() / (duration.toMillis() * UnitConversions.MS_TO_S));
+        return new Speed(distance.toM() / (duration.toMillis() / (double) Duration.ofSeconds(1).toMillis()));
     }
 
     public static Speed of(double speed_mps) {

src/main/java/de/dennisguse/opentracks/data/models/UnitConversions.java

@@ -15,6 +15,8 @@
  */
 package de.dennisguse.opentracks.data.models;
 
+import java.time.Duration;
+
 /**
  * Unit conversion constants.
  *
@@ -22,24 +24,6 @@ package de.dennisguse.opentracks.data.models;
  */
 public class UnitConversions {
 
-    // Time //TODO Use Duration
-    // multiplication factor to convert seconds to milliseconds
-    @Deprecated
-    public static final long S_TO_MS = 1000;
-
-    // multiplication factor to convert milliseconds to seconds
-    @Deprecated
-    public static final double MS_TO_S = 1d / S_TO_MS;
-    // multiplication factor to convert minutes to seconds
-    @Deprecated
-    public static final double MIN_TO_S = 60.0;
-    // multiplication factor to convert seconds to minutes
-    @Deprecated
-    public static final double S_TO_MIN = 1 / MIN_TO_S;
-    // multiplication factor to convert minutes to hours
-    @Deprecated
-    public static final double MIN_TO_HR = 1 / 60.0;
-
     // multiplication factor to convert kilometers to miles
     public static final double KM_TO_MI = 0.621371192;
 
@@ -58,7 +42,7 @@ public class UnitConversions {
     public static final double M_TO_NAUTICAL_MILE = 1 / NAUTICAL_MILE_TO_M;
     public static final double KM_TO_NAUTICAL_MILE = 1000 * M_TO_NAUTICAL_MILE;
     // multiplication factor to convert meters per second to kilometers per hour
-    public static final double MPS_TO_KMH = M_TO_KM / (S_TO_MIN * MIN_TO_HR);
+    public static final double MPS_TO_KMH = M_TO_KM / (1d / Duration.ofHours(1).toSeconds());
     // multiplication factor to convert miles to km
     public static final double MI_TO_KM = 1 / KM_TO_MI;
     // multiplication factor to convert miles to m