rename package

The package not only contains the GeoPoint definition, but other
location related classes, too.

1 files changed, 0 insertions, 62 deletions

diff --git a/main/src/cgeo/geocaching/geopoint/Units.java b/main/src/cgeo/geocaching/geopoint/Units.java
deleted file mode 100644
index c657ede..0000000
--- a/main/src/cgeo/geocaching/geopoint/Units.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package cgeo.geocaching.geopoint;
-
-import cgeo.geocaching.settings.Settings;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-
-import java.util.Locale;
-
-public class Units {
-
-    public static ImmutablePair<Double, String> scaleDistance(final double distanceKilometers) {
-        double distance;
-        String units;
-        if (Settings.useImperialUnits()) {
-            distance = distanceKilometers / IConversion.MILES_TO_KILOMETER;
-            if (distance >= 0.1) {
-                units = "mi";
-            } else {
-                distance *= 5280;
-                units = "ft";
-            }
-        } else {
-            if (distanceKilometers >= 1) {
-                distance = distanceKilometers;
-                units = "km";
-            } else {
-                distance = distanceKilometers * 1000;
-                units = "m";
-            }
-        }
-        return new ImmutablePair<>(distance, units);
-    }
-
-    public static String getDistanceFromKilometers(final Float distanceKilometers) {
-        if (distanceKilometers == null) {
-            return "?";
-        }
-
-        final ImmutablePair<Double, String> scaled = scaleDistance(distanceKilometers);
-        String formatString;
-        if (scaled.left >= 100) {
-            formatString = "%.0f";
-        } else if (scaled.left >= 10) {
-            formatString = "%.1f";
-        } else {
-            formatString = "%.2f";
-        }
-
-        return String.format(formatString + " %s", scaled.left, scaled.right);
-    }
-
-    public static String getDistanceFromMeters(float meters) {
-        return getDistanceFromKilometers(meters / 1000f);
-    }
-
-    public static String getSpeed(final float kilometersPerHour) {
-        if (Settings.useImperialUnits()) {
-            return String.format(Locale.US, "%.0f mph", kilometersPerHour / IConversion.MILES_TO_KILOMETER);
-        }
-        return String.format(Locale.US, "%.0f km/h", kilometersPerHour);
-    }
-}