1 files changed, 5 insertions, 24 deletions

diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java
index f5da2a1..869b9dd 100644
--- a/main/src/cgeo/geocaching/cgeonavigate.java
+++ b/main/src/cgeo/geocaching/cgeonavigate.java
@@ -26,8 +26,7 @@ import java.util.List;
 
 public class cgeonavigate extends AbstractActivity {
 
-    private static final String EXTRAS_LONGITUDE = "longitude";
-    private static final String EXTRAS_LATITUDE = "latitude";
+    private static final String EXTRAS_COORDS = "coords";
     private static final String EXTRAS_NAME = "name";
     private static final String EXTRAS_GEOCODE = "geocode";
     private static final List<IWaypoint> coordinates = new ArrayList<IWaypoint>();
@@ -88,7 +87,7 @@ public class cgeonavigate extends AbstractActivity {
             geocode = extras.getString(EXTRAS_GEOCODE);
             title = geocode;
             name = extras.getString(EXTRAS_NAME);
-            dstCoords = new Geopoint(extras.getDouble(EXTRAS_LATITUDE), extras.getDouble(EXTRAS_LONGITUDE));
+            dstCoords = (Geopoint) extras.getParcelable(EXTRAS_COORDS);
 
             if (StringUtils.isNotBlank(name)) {
                 if (StringUtils.isNotBlank(title)) {
@@ -271,7 +270,7 @@ public class cgeonavigate extends AbstractActivity {
             setDestCoords();
             updateDistanceInfo();
 
-            Log.d(Settings.tag, "destination set: " + title + " (" + dstCoords + ")");
+            Log.d("destination set: " + title + " (" + dstCoords + ")");
             return true;
         }
 
@@ -294,23 +293,6 @@ public class cgeonavigate extends AbstractActivity {
         ((TextView) findViewById(R.id.destination)).setText(dstCoords.toString());
     }
 
-    public void setDest(final Geopoint coords) {
-        if (coords == null) {
-            return;
-        }
-
-        title = "some place";
-        setTitle();
-        setDestCoords();
-
-        dstCoords = coords;
-        updateDistanceInfo();
-    }
-
-    public Geopoint getCoordinatesNow() {
-        return geo.coordsNow;
-    }
-
     private void updateDistanceInfo() {
         if (geo == null || geo.coordsNow == null || dstCoords == null) {
             return;
@@ -384,7 +366,7 @@ public class cgeonavigate extends AbstractActivity {
                     northHeading = geo.bearingNow;
                 }
             } catch (Exception e) {
-                Log.w(Settings.tag, "Failed to update location.");
+                Log.w("Failed to update location.");
             }
         }
     }
@@ -410,8 +392,7 @@ public class cgeonavigate extends AbstractActivity {
         }
 
         final Intent navigateIntent = new Intent(context, cgeonavigate.class);
-        navigateIntent.putExtra(EXTRAS_LATITUDE, coords.getLatitude());
-        navigateIntent.putExtra(EXTRAS_LONGITUDE, coords.getLongitude());
+        navigateIntent.putExtra(EXTRAS_COORDS, coords);
         navigateIntent.putExtra(EXTRAS_GEOCODE, geocode.toUpperCase());
         if (null != displayedName) {
             navigateIntent.putExtra(EXTRAS_NAME, displayedName);