1 files changed, 15 insertions, 14 deletions

diff --git a/main/src/cgeo/geocaching/connector/gc/GCMap.java b/main/src/cgeo/geocaching/connector/gc/GCMap.java
index 49f61ef..4bc55fe 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCMap.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCMap.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.connector.gc;
 
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.Settings;
+import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.cgData;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.CacheSize;
@@ -92,7 +92,7 @@ public class GCMap {
                 JSONObject ownerObj = dataObject.getJSONObject("owner");
                 cache.setOwnerDisplayName(ownerObj.getString("text"));
 
-                result.addCache(cache);
+                result.addAndPutInCache(cache);
 
             }
         } catch (JSONException e) {
@@ -231,13 +231,13 @@ public class GCMap {
                     exclude = true;
                 }
                 if (!exclude) {
-                    searchResult.addCache(cache);
+                    searchResult.addAndPutInCache(cache);
                 }
             }
             Log.d("Retrieved " + searchResult.getCount() + " caches for tile " + tile.toString());
 
         } catch (Exception e) {
-            Log.e("GCBase.parseMapJSON", e);
+            Log.e("GCMap.parseMapJSON", e);
         }
 
         return searchResult;
@@ -283,7 +283,7 @@ public class GCMap {
      * @return
      */
     private static SearchResult searchByViewport(final Viewport viewport, final String[] tokens, Strategy strategy) {
-        Log.d("GCBase.searchByViewport" + viewport.toString());
+        Log.d("GCMap.searchByViewport" + viewport.toString());
 
         final SearchResult searchResult = new SearchResult();
         searchResult.setUrl(GCConstants.URL_LIVE_MAP + "?ll=" + viewport.getCenter().getLatitude() + "," + viewport.getCenter().getLongitude());
@@ -330,14 +330,14 @@ public class GCMap {
 
                     String data = Tile.requestMapInfo(GCConstants.URL_MAP_INFO, params, GCConstants.URL_LIVE_MAP);
                     if (StringUtils.isEmpty(data)) {
-                        Log.w("GCBase.searchByViewport: No data from server for tile (" + tile.getX() + "/" + tile.getY() + ")");
+                        Log.w("GCMap.searchByViewport: No data from server for tile (" + tile.getX() + "/" + tile.getY() + ")");
                     } else {
                         final SearchResult search = GCMap.parseMapJSON(data, tile, bitmap, strategy);
                         if (search == null || CollectionUtils.isEmpty(search.getGeocodes())) {
-                            Log.e("GCBase.searchByViewport: No cache parsed for viewport " + viewport);
+                            Log.e("GCMap.searchByViewport: No cache parsed for viewport " + viewport);
                         }
                         else {
-                            searchResult.addGeocodes(search.getGeocodes());
+                            searchResult.addSearchResult(search);
                         }
                         Tile.Cache.add(tile);
                     }
@@ -349,20 +349,21 @@ public class GCMap {
 
                 }
             }
+
+            // Check for vanished found caches
+            if (tiles.iterator().next().getZoomlevel() >= Tile.ZOOMLEVEL_MIN_PERSONALIZED) {
+                searchResult.addFilteredGeocodes(cgData.getCachedMissingFromSearch(searchResult, tiles, GCConnector.getInstance(), Tile.ZOOMLEVEL_MIN_PERSONALIZED - 1));
+            }
         }
 
-        if (strategy.flags.contains(StrategyFlag.SEARCH_NEARBY)) {
+        if (strategy.flags.contains(StrategyFlag.SEARCH_NEARBY) && Settings.isPremiumMember()) {
             final Geopoint center = viewport.getCenter();
             if ((lastSearchViewport == null) || !lastSearchViewport.contains(center)) {
                 //FIXME We don't have a RecaptchaReceiver!?
                 SearchResult search = GCParser.searchByCoords(center, Settings.getCacheType(), false, null);
                 if (search != null && !search.isEmpty()) {
                     final Set<String> geocodes = search.getGeocodes();
-                    if (Settings.isPremiumMember()) {
-                        lastSearchViewport = cgData.getBounds(geocodes);
-                    } else {
-                        lastSearchViewport = new Viewport(center, center);
-                    }
+                    lastSearchViewport = cgData.getBounds(geocodes);
                     searchResult.addGeocodes(geocodes);
                 }
             }