Changed retrieval behavior of Live Map

2 files changed, 12 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 3d25087..e6978ce 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1802,7 +1802,7 @@ public class cgeocaches extends AbstractListActivity {
 
         @Override
         public void run() {
-            search = cgBase.searchByCoords(this, coords, cacheType, 0, Settings.isShowCaptcha());
+            search = cgBase.searchByCoords(this, coords, cacheType, StoredList.TEMPORARY_LIST_ID, Settings.isShowCaptcha());
 
             handler.sendMessage(new Message());
         }
diff --git a/main/src/cgeo/geocaching/connector/gc/GCBase.java b/main/src/cgeo/geocaching/connector/gc/GCBase.java
index dd9c56e..eb7603b 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCBase.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCBase.java
@@ -3,6 +3,7 @@ package cgeo.geocaching.connector.gc;
 import cgeo.geocaching.GCConstants;
 import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.Settings;
+import cgeo.geocaching.StoredList;
 import cgeo.geocaching.cgBase;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.enumerations.CacheType;
@@ -53,6 +54,8 @@ public class GCBase {
     @SuppressWarnings("null")
     public static SearchResult searchByViewport(final Viewport viewport, final String[] tokens) {
 
+        Log.d(Settings.tag, "GCBase.searchByViewport" + viewport.toString());
+
         String referer = GCConstants.URL_LIVE_MAP;
 
         final SearchResult searchResult = new SearchResult();
@@ -102,6 +105,11 @@ public class GCBase {
             }
         }
 
+        if (Settings.isPremiumMember()) {
+            SearchResult search = cgBase.searchByCoords(null, viewport.getCenter(), Settings.getCacheType(), StoredList.TEMPORARY_LIST_ID, Settings.isShowCaptcha());
+            searchResult.addGeocodes(search.getGeocodes());
+        }
+
         return searchResult;
     }
 
@@ -236,7 +244,9 @@ public class GCBase {
      */
     protected static List<Tile> getTilesForViewport(final Viewport viewport) {
         List<Tile> tiles = new ArrayList<Tile>();
-        tiles.add(new Tile(viewport.getCenter(), 14)); // precise coords for caches nearby
+        if (!Settings.isPremiumMember()) {
+            tiles.add(new Tile(viewport.getCenter(), 14)); // precise coords for caches nearby
+        }
         tiles.add(new Tile(viewport.getCenter(), 12)); // other caches around
         return tiles;
     }