4 files changed, 13 insertions, 12 deletions
diff --git a/main/src/cgeo/geocaching/CacheCache.java b/main/src/cgeo/geocaching/CacheCache.java
index 7f6f67e..41380fa 100644
--- a/main/src/cgeo/geocaching/CacheCache.java
+++ b/main/src/cgeo/geocaching/CacheCache.java
@@ -110,7 +110,7 @@ public class CacheCache {
 
         @Override
         public void onRemove(cgCache removed) {
-            GCBase.removeFromTileCache(removed.getCoords());
+            GCBase.removeFromTileCache(removed);
         }
     }
 
diff --git a/main/src/cgeo/geocaching/connector/gc/GCBase.java b/main/src/cgeo/geocaching/connector/gc/GCBase.java
index 2f22c52..4ba1be6 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCBase.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCBase.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.connector.gc;
 
+import cgeo.geocaching.ICoordinates;
 import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.cgCache;
@@ -87,11 +88,11 @@ public class GCBase {
         }
     }
 
-    public static void removeFromTileCache(Geopoint coords) {
-        if (coords != null) {
+    public static void removeFromTileCache(final ICoordinates point) {
+        if (point != null) {
             Collection<Tile> tiles = new ArrayList<Tile>(tileCache.values());
             for (Tile tile : tiles) {
-                if (tile.containsPoint(coords)) {
+                if (tile.containsPoint(point)) {
                     tileCache.remove(tile.hashCode());
                 }
             }
@@ -182,7 +183,7 @@ public class GCBase {
         }
 
         if (strategy.flags.contains(StrategyFlag.SEARCH_NEARBY)) {
-            Geopoint center = viewport.getCenter();
+            final Geopoint center = viewport.getCenter();
             if ((lastSearchViewport == null) || !lastSearchViewport.contains(center)) {
                 SearchResult search = GCParser.searchByCoords(null, center, Settings.getCacheType(), false);
                 if (search != null && !search.isEmpty()) {
diff --git a/main/src/cgeo/geocaching/connector/gc/Tile.java b/main/src/cgeo/geocaching/connector/gc/Tile.java
index 289c9db..692f28b 100644
--- a/main/src/cgeo/geocaching/connector/gc/Tile.java
+++ b/main/src/cgeo/geocaching/connector/gc/Tile.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.connector.gc;
 
+import cgeo.geocaching.ICoordinates;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
 import cgeo.geocaching.network.Network;
@@ -222,8 +223,7 @@ public class Tile {
         return null;
     }
 
-    public boolean containsPoint(Geopoint coords) {
-
-        return viewPort.contains(coords);
+    public boolean containsPoint(final ICoordinates point) {
+        return viewPort.contains(point);
     }
 }
diff --git a/main/src/cgeo/geocaching/geopoint/Viewport.java b/main/src/cgeo/geocaching/geopoint/Viewport.java
index 5080775..4f70291 100644
--- a/main/src/cgeo/geocaching/geopoint/Viewport.java
+++ b/main/src/cgeo/geocaching/geopoint/Viewport.java
@@ -150,12 +150,11 @@ public class Viewport {
     static public Viewport containing(final Set<? extends ICoordinates> points) {
         Viewport viewport = null;
         for (final ICoordinates point : points) {
-            final Geopoint coords = point == null ? null : point.getCoords();
-            if (coords != null) {
+            if (point != null) {
                 if (viewport == null) {
-                    viewport = new Viewport(coords, coords);
+                    viewport = new Viewport(point, point);
                 } else {
-                    viewport = viewport.expand(coords);
+                    viewport = viewport.expand(point);
                 }
             }
         }
@@ -175,4 +174,5 @@ public class Viewport {
     public int hashCode() {
         return bottomLeft.hashCode() ^ topRight.hashCode();
     }
+
 }