6 files changed, 9 insertions, 17 deletions
diff --git a/src/cgeo/geocaching/cgBase.java b/src/cgeo/geocaching/cgBase.java
index 3d4362a..4ddae1b 100644
--- a/src/cgeo/geocaching/cgBase.java
+++ b/src/cgeo/geocaching/cgBase.java
@@ -174,9 +174,9 @@ public class cgBase {
 	private static final Pattern patternViewstateFieldCount = Pattern.compile("id=\"__VIEWSTATEFIELDCOUNT\"[^(value)]+value=\"(\\d+)\"[^>]+>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
 	private static final Pattern patternViewstates = Pattern.compile("id=\"__VIEWSTATE(\\d*)\"[^(value)]+value=\"([^\"]+)\"[^>]+>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
 	private static final Pattern patternIsPremium = Pattern.compile("<span id=\"ctl00_litPMLevel\"", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
-	public static final double miles2km = 1.609344;
-	public static final double feet2km = 0.0003048;
-	public static final double yards2km = 0.0009144;
+	public static final float miles2km = 1.609344f;
+	public static final float feet2km = 0.0003048f;
+	public static final float yards2km = 0.0009144f;
 	public static final double deg2rad = Math.PI / 180;
 	public static final double rad2deg = 180 / Math.PI;
 	public static final float erad = 6371.0f;
@@ -2368,14 +2368,6 @@ public class cgBase {
 			return "?";
 		}
 
-		return getHumanDistance(Double.valueOf(distance));
-	}
-
-	public String getHumanDistance(Double distance) {
-		if (distance == null) {
-			return "?";
-		}
-
 		if (settings.units == cgSettings.unitsImperial) {
 			distance /= miles2km;
 			if (distance > 100) {
diff --git a/src/cgeo/geocaching/cgCache.java b/src/cgeo/geocaching/cgCache.java
index b328606..4a16d76 100644
--- a/src/cgeo/geocaching/cgCache.java
+++ b/src/cgeo/geocaching/cgCache.java
@@ -49,7 +49,7 @@ public class cgCache implements ICache {
 	public Float difficulty = Float.valueOf(0);
 	public Float terrain = Float.valueOf(0);
 	public Float direction = null;
-	public Double distance = null;
+	public Float distance = null;
 	public String latlon = "";
 	public String latitudeString = "";
 	public String longitudeString = "";
diff --git a/src/cgeo/geocaching/cgData.java b/src/cgeo/geocaching/cgData.java
index 731dffc..97afcff 100644
--- a/src/cgeo/geocaching/cgData.java
+++ b/src/cgeo/geocaching/cgData.java
@@ -1936,7 +1936,7 @@ public class cgData {
 		if (cursor.isNull(index)) {
 			cache.distance = null;
 		} else {
-			cache.distance = (Double) cursor.getDouble(index);
+			cache.distance = cursor.getFloat(index);
 		}
 		cache.terrain = (Float) cursor.getFloat(cursor.getColumnIndex("terrain"));
 		cache.latlon = (String) cursor.getString(cursor.getColumnIndex("latlon"));
diff --git a/src/cgeo/geocaching/cgDistanceView.java b/src/cgeo/geocaching/cgDistanceView.java
index 2e17247..9030bbb 100644
--- a/src/cgeo/geocaching/cgDistanceView.java
+++ b/src/cgeo/geocaching/cgDistanceView.java
@@ -33,7 +33,7 @@ public class cgDistanceView extends TextView {
 		setText(base.getHumanDistance(coords.distanceTo(cacheCoords)));
 	}
 
-	public void setDistance(Double distance) {
+	public void setDistance(Float distance) {
 		setText("~" + base.getHumanDistance(distance));
 	}
 
diff --git a/src/cgeo/geocaching/cgTrackable.java b/src/cgeo/geocaching/cgTrackable.java
index 19b66b8..fb877ad 100644
--- a/src/cgeo/geocaching/cgTrackable.java
+++ b/src/cgeo/geocaching/cgTrackable.java
@@ -23,7 +23,7 @@ public class cgTrackable {
 	public Spannable nameSp = null;
 	public String type = null;
 	public Date released = null;
-	public Double distance = null;
+	public Float distance = null;
 	public String origin = null;
 	public String owner = null;
 	public String ownerGuid = null;
diff --git a/src/cgeo/geocaching/geopoint/DistanceParser.java b/src/cgeo/geocaching/geopoint/DistanceParser.java
index 3578902..a5b3d7b 100644
--- a/src/cgeo/geocaching/geopoint/DistanceParser.java
+++ b/src/cgeo/geocaching/geopoint/DistanceParser.java
@@ -19,14 +19,14 @@ public final class DistanceParser {
      *
      * @throws NumberFormatException if the given number is invalid
      */
-    public static double parseDistance(String distanceText, final int defaultUnit) {
+    public static float parseDistance(String distanceText, final int defaultUnit) {
         final Matcher matcher = pattern.matcher(distanceText);
 
         if (!matcher.find()) {
             throw new NumberFormatException(distanceText);
         }
 
-        final double value = Double.parseDouble(matcher.group(1));
+        final float value = Float.parseFloat(matcher.group(1));
         final String unit = matcher.group(2).toLowerCase();
 
         if (unit.equals("m") || (unit.length() == 0 && defaultUnit == cgSettings.unitsMetric)) {