Merge pull request #427 from samueltardieu/inline-operations

Inline operations regarding Geopoint

1 files changed, 5 insertions, 6 deletions

diff --git a/src/cgeo/geocaching/cgDistanceView.java b/src/cgeo/geocaching/cgDistanceView.java
index ae9e7b7..9030bbb 100644
--- a/src/cgeo/geocaching/cgDistanceView.java
+++ b/src/cgeo/geocaching/cgDistanceView.java
@@ -27,14 +27,13 @@ public class cgDistanceView extends TextView {
 	}
 
 	public void update(final Geopoint coords) {
-		if (cacheCoords == null) return;
-		if (coords == null) return;
-		if (base == null) return;
-
-		setText(base.getHumanDistance(cgBase.getDistance(coords, cacheCoords)));
+		if (cacheCoords == null || coords == null || base == null) {
+			return;
+		}
+		setText(base.getHumanDistance(coords.distanceTo(cacheCoords)));
 	}
 
-	public void setDistance(Double distance) {
+	public void setDistance(Float distance) {
 		setText("~" + base.getHumanDistance(distance));
 	}