diff options
| author | Bananeweizen <Bananeweizen@gmx.de> | 2012-02-18 12:01:10 +0100 |
|---|---|---|
| committer | Bananeweizen <Bananeweizen@gmx.de> | 2012-02-18 12:01:10 +0100 |
| commit | 34c0e4065a45c55daf5c230c5d27df2d63703b23 (patch) | |
| tree | 65b6164d229552ffcaa0941a372857b511c815be /main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java | |
| parent | 80ca9619a38e105c953da22bdd15f0dd3087aa0e (diff) | |
| download | cgeo-34c0e4065a45c55daf5c230c5d27df2d63703b23.zip cgeo-34c0e4065a45c55daf5c230c5d27df2d63703b23.tar.gz cgeo-34c0e4065a45c55daf5c230c5d27df2d63703b23.tar.bz2 | |
#945: unify navigation methods
* removed search result parameter from navigation invocation
* removed "fromDetail" differentiation in popup
Diffstat (limited to 'main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java')
| -rw-r--r-- | main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java b/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java index f8d5c0f..44f151e 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java @@ -1,7 +1,6 @@ package cgeo.geocaching.apps.cache.navi; import cgeo.geocaching.R; -import cgeo.geocaching.SearchResult; import cgeo.geocaching.cgCache; import cgeo.geocaching.cgGeo; import cgeo.geocaching.cgWaypoint; @@ -20,12 +19,10 @@ class InternalMap extends AbstractNavigationApp { @Override public boolean invoke(cgGeo geo, Activity activity, cgCache cache, - final SearchResult search, cgWaypoint waypoint, final Geopoint coords) { - if (search != null) { - CGeoMap.startActivitySearch(activity, search, cache != null ? cache.getGeocode() : null, true); - } - else if (cache != null) { + cgWaypoint waypoint, final Geopoint coords) { + if (cache != null) { CGeoMap.startActivityGeoCode(activity, cache.getGeocode()); + // may need some code from CGeoMap.startActivitySearch(activity, search, cache != null ? cache.getGeocode() : null, true); } else if (waypoint != null) { CGeoMap.startActivityCoords(activity, waypoint.getCoords(), waypoint.getWaypointType(), waypoint.getName()); |
