Refactoring package structure.

Part of #963.
2022-01-12 22:57:35 +01:00
parent a9f1381dae
commit 58b1396d64
20 changed files with 28 additions and 34 deletions
@@ -29,9 +29,9 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.UnitConversions;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.UnitConversions;

 /**
 * Generates descriptions for tracks and markers.
@@ -4,8 +4,6 @@ import androidx.annotation.NonNull;

 import java.util.Objects;

-import de.dennisguse.opentracks.util.UnitConversions;
-
 public class Distance {

    public static Distance of(double distance_m) {
@@ -6,7 +6,6 @@ import java.time.Duration;
 import java.util.Objects;

 import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.util.UnitConversions;

 public class Speed {

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package de.dennisguse.opentracks.content.data;
+
+/**
+ * Unit conversion constants.
+ *
+ * @author Sandor Dornbush
+ */
+public class UnitConversions {
+
+    // Time //TODO Use Duration
+    // multiplication factor to convert seconds to milliseconds
+    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;
+
+    // Distance //TODO Make private to Distance class!
+    // multiplication factor to convert miles to feet
+    private static final double MI_TO_FT = 5280.0;
+    // multiplication factor to covert kilometers to meters
+    public static final double KM_TO_M = 1000.0;
+    // multiplication factor to convert meters to kilometers
+    public static final double M_TO_KM = 1 / KM_TO_M;
+    // multiplication factor to convert meters to miles
+    public static final double M_TO_MI = M_TO_KM * KM_TO_MI;
+    // multiplication factor to convert meters to feet
+    public static final double M_TO_FT = M_TO_MI * MI_TO_FT;
+    // 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);
+    // 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
+    public static final double MI_TO_M = MI_TO_KM * KM_TO_M;
+
+    private UnitConversions() {
+    }
+}
@@ -10,8 +10,8 @@ import java.time.Duration;

 import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Speed;
-import de.dennisguse.opentracks.util.UintUtils;
-import de.dennisguse.opentracks.util.UnitConversions;
+import de.dennisguse.opentracks.content.data.UnitConversions;
+import de.dennisguse.opentracks.services.sensors.UintUtils;

 /**
 * Provides cadence in rpm and speed in milliseconds from Bluetooth LE Cycling Cadence and Speed sensors.