Displaying distance to waypoint on map popup

1 files changed, 21 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
index e98bd77..80f01e2 100644
--- a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
+++ b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
@@ -2,6 +2,7 @@ package cgeo.geocaching.ui;
 
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
+import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Units;
@@ -154,4 +155,24 @@ public final class CacheDetailsCreator {
         }
         add(R.string.cache_distance, text);
     }
+
+    public void addDistance(final Waypoint wpt, final TextView waypointDistanceView) {
+        Float distance = null;
+        if (wpt.getCoords() != null) {
+            final Geopoint currentCoords = cgeoapplication.getInstance().currentGeo().getCoords();
+            if (currentCoords != null) {
+                distance = currentCoords.distanceTo(wpt);
+            }
+        }
+        String text = "--";
+        if (distance != null) {
+            text = Units.getDistanceFromKilometers(distance);
+        }
+        else if (waypointDistanceView != null) {
+            // if there is already a distance in waypointDistance, use it instead of resetting to default.
+            // this prevents displaying "--" while waiting for a new position update (See bug #1468)
+            text = waypointDistanceView.getText().toString();
+        }
+        add(R.string.cache_distance, text);
+    }
 }