1 files changed, 11 insertions, 23 deletions

diff --git a/main/src/cgeo/geocaching/geopoint/Units.java b/main/src/cgeo/geocaching/geopoint/Units.java
index 3da3ad9..b99e00e 100644
--- a/main/src/cgeo/geocaching/geopoint/Units.java
+++ b/main/src/cgeo/geocaching/geopoint/Units.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.geopoint;
 
-import cgeo.geocaching.Settings;
+import cgeo.geocaching.settings.Settings;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
@@ -9,15 +9,7 @@ public class Units {
     public static ImmutablePair<Double, String> scaleDistance(final double distanceKilometers) {
         double distance;
         String units;
-        if (Settings.isUseMetricUnits()) {
-            if (distanceKilometers >= 1) {
-                distance = distanceKilometers;
-                units = "km";
-            } else {
-                distance = distanceKilometers * 1000;
-                units = "m";
-            }
-        } else {
+        if (Settings.isUseImperialUnits()) {
             distance = distanceKilometers / IConversion.MILES_TO_KILOMETER;
             if (distance >= 0.1) {
                 units = "mi";
@@ -25,6 +17,14 @@ public class Units {
                 distance *= 5280;
                 units = "ft";
             }
+        } else {
+            if (distanceKilometers >= 1) {
+                distance = distanceKilometers;
+                units = "km";
+            } else {
+                distance = distanceKilometers * 1000;
+                units = "m";
+            }
         }
         return new ImmutablePair<Double, String>(distance, units);
     }
@@ -47,18 +47,6 @@ public class Units {
         return String.format(formatString + " %s", scaled.left, scaled.right);
     }
 
-    /**
-     * Get human readable elevation, depending on settings for metric units.
-     * Result is rounded to full meters/feet, as the sensors don't have that precision anyway.
-     *
-     * @param meters
-     * @return
-     */
-    public static String getElevation(float meters) {
-        final ImmutablePair<Double, String> scaled = scaleDistance(meters / 1000f);
-        return (meters >= 0 ? "↥ " : "↧ ") + String.format("%d %s", Math.abs(Math.round(scaled.left)), scaled.right);
-    }
-
     public static String getDistanceFromMeters(float meters) {
         return getDistanceFromKilometers(meters / 1000f);
     }
@@ -68,6 +56,6 @@ public class Units {
         if (speed.endsWith("mi")) {
             return speed.substring(0, speed.length() - 2) + "mph";
         }
-        return speed + (Settings.isUseMetricUnits() ? "/h" : "ph");
+        return speed + (!Settings.isUseImperialUnits() ? "/h" : "ph");
     }
 }