diff options
Diffstat (limited to 'main/src/cgeo/geocaching/apps/cache/navi')
9 files changed, 33 insertions, 33 deletions
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java index cfab5d2..30a3b4b 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java @@ -35,10 +35,10 @@ class GoogleMapsApp extends AbstractNavigationApp implements NavigationApp { } try { - if (cache != null && cache.coords != null) { - startActivity(activity, cache.coords); - } else if (waypoint != null && waypoint.coords != null) { - startActivity(activity, waypoint.coords); + if (cache != null && cache.getCoords() != null) { + startActivity(activity, cache.getCoords()); + } else if (waypoint != null && waypoint.getCoords() != null) { + startActivity(activity, waypoint.getCoords()); } else if (coords != null) { startActivity(activity, coords); } diff --git a/main/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java b/main/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java index 20b012d..ad96be3 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java @@ -41,10 +41,10 @@ class GoogleNavigationApp extends AbstractNavigationApp implements navigationResult = navigateToCoordinates(geo, activity, coords); } else if (waypoint != null) { - navigationResult = navigateToCoordinates(geo, activity, waypoint.coords); + navigationResult = navigateToCoordinates(geo, activity, waypoint.getCoords()); } else if (cache != null) { - navigationResult = navigateToCoordinates(geo, activity, cache.coords); + navigationResult = navigateToCoordinates(geo, activity, cache.getCoords()); } if (!navigationResult) { diff --git a/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java b/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java index c3ccaa7..9192d16 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/InternalMap.java @@ -24,13 +24,13 @@ class InternalMap extends AbstractInternalMap implements cgCache cache, final cgSearch search, cgWaypoint waypoint, final Geopoint coords) { if (search != null) { - CGeoMap.startActivitySearch(activity, search, cache != null ? cache.geocode : null, true); + CGeoMap.startActivitySearch(activity, search, cache != null ? cache.getGeocode() : null, true); } else if (cache != null) { - CGeoMap.startActivityGeoCode(activity, cache.geocode); + CGeoMap.startActivityGeoCode(activity, cache.getGeocode()); } else if (waypoint != null) { - CGeoMap.startActivityCoords(activity, waypoint.coords, waypoint.type, waypoint.name); + CGeoMap.startActivityCoords(activity, waypoint.getCoords(), waypoint.getWaypointType(), waypoint.getName()); } else if (coords != null) { CGeoMap.startActivityCoords(activity, coords, WaypointType.WAYPOINT, null); diff --git a/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java b/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java index b174f14..544ad33 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java @@ -37,12 +37,12 @@ class LocusApp extends AbstractLocusApp implements NavigationApp { final ArrayList<Object> points = new ArrayList<Object>(); // add cache if present - if (cache != null && cache.coords != null) { + if (cache != null && cache.getCoords() != null) { points.add(cache); } // add waypoint if present - if (waypoint != null && waypoint.coords != null) { + if (waypoint != null && waypoint.getCoords() != null) { points.add(waypoint); } diff --git a/main/src/cgeo/geocaching/apps/cache/navi/OruxMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/OruxMapsApp.java index 8e1373d..09bf9e7 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/OruxMapsApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/OruxMapsApp.java @@ -48,10 +48,10 @@ class OruxMapsApp extends AbstractNavigationApp implements NavigationApp { private static Geopoint getCoords(cgCache cache, cgWaypoint waypoint, Geopoint coords) { if (cache != null) { - return cache.coords; + return cache.getCoords(); } else if (waypoint != null) { - return waypoint.coords; + return waypoint.getCoords(); } return coords; } diff --git a/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java index 16fc04d..cb0b520 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java @@ -14,7 +14,7 @@ import android.content.res.Resources; import java.util.ArrayList; import java.util.Locale; -class RMapsApp extends AbstractNavigationApp implements NavigationApp { +class RMapsApp extends AbstractNavigationApp { private static final String INTENT = "com.robert.maps.action.SHOW_POINTS"; @@ -33,24 +33,24 @@ class RMapsApp extends AbstractNavigationApp implements NavigationApp { try { if (isInstalled(activity)) { final ArrayList<String> locations = new ArrayList<String>(); - if (cache != null && cache.coords != null) { + if (cache != null && cache.getCoords() != null) { locations.add(String.format((Locale) null, "%.6f", - cache.coords.getLatitude()) + cache.getCoords().getLatitude()) + "," + String.format((Locale) null, "%.6f", - cache.coords.getLongitude()) + cache.getCoords().getLongitude()) + ";" - + cache.geocode - + ";" + cache.name); - } else if (waypoint != null && waypoint.coords != null) { + + cache.getGeocode() + + ";" + cache.getName()); + } else if (waypoint != null && waypoint.getCoords() != null) { locations.add(String.format((Locale) null, "%.6f", - waypoint.coords.getLatitude()) + waypoint.getCoords().getLatitude()) + "," + String.format((Locale) null, "%.6f", - waypoint.coords.getLongitude()) + waypoint.getCoords().getLongitude()) + ";" - + waypoint.lookup - + ";" + waypoint.name); + + waypoint.getLookup() + + ";" + waypoint.getName()); } final Intent intent = new Intent(INTENT); diff --git a/main/src/cgeo/geocaching/apps/cache/navi/RadarApp.java b/main/src/cgeo/geocaching/apps/cache/navi/RadarApp.java index a9584e1..40458d5 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/RadarApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/RadarApp.java @@ -36,10 +36,10 @@ class RadarApp extends AbstractNavigationApp implements NavigationApp { cgCache cache, final cgSearch search, cgWaypoint waypoint, final Geopoint coords) { if (cache != null) { - return navigateTo(activity, cache.coords); + return navigateTo(activity, cache.getCoords()); } if (waypoint != null) { - return navigateTo(activity, waypoint.coords); + return navigateTo(activity, waypoint.getCoords()); } return navigateTo(activity, coords); } diff --git a/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java b/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java index c29ca9f..3de37d4 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java @@ -31,14 +31,14 @@ class StaticMapApp extends AbstractNavigationApp implements cgCache cache, final cgSearch search, cgWaypoint waypoint, final Geopoint coords) { - if (cache == null || cache.reason == 0) { + if (cache == null || cache.getReason() == 0) { ActivityMixin.showToast(activity, res.getString(R.string.err_detail_no_map_static)); return true; } - if (cache.geocode != null) { + if (cache.getGeocode() != null) { Intent smapsIntent = new Intent(activity, cgeosmaps.class); - smapsIntent.putExtra("geocode", cache.geocode.toUpperCase()); + smapsIntent.putExtra("geocode", cache.getGeocode().toUpperCase()); activity.startActivity(smapsIntent); return true; } diff --git a/main/src/cgeo/geocaching/apps/cache/navi/StreetviewApp.java b/main/src/cgeo/geocaching/apps/cache/navi/StreetviewApp.java index e443ff0..5a5a4f5 100644 --- a/main/src/cgeo/geocaching/apps/cache/navi/StreetviewApp.java +++ b/main/src/cgeo/geocaching/apps/cache/navi/StreetviewApp.java @@ -34,10 +34,10 @@ class StreetviewApp extends AbstractNavigationApp implements NavigationApp { } try { - if (cache != null && cache.coords != null) { - startActivity(activity, cache.coords); - } else if (waypoint != null && waypoint.coords != null) { - startActivity(activity, waypoint.coords); + if (cache != null && cache.getCoords() != null) { + startActivity(activity, cache.getCoords()); + } else if (waypoint != null && waypoint.getCoords() != null) { + startActivity(activity, waypoint.getCoords()); } else if (coords != null) { startActivity(activity, coords); } |