diff options
| -rw-r--r-- | main/src/cgeo/geocaching/SearchResult.java | 4 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/cgeoapplication.java | 7 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCBase.java | 2 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/cgBaseTest.java | 2 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/main/src/cgeo/geocaching/SearchResult.java b/main/src/cgeo/geocaching/SearchResult.java index f7458fe..556ef32 100644 --- a/main/src/cgeo/geocaching/SearchResult.java +++ b/main/src/cgeo/geocaching/SearchResult.java @@ -200,4 +200,8 @@ public class SearchResult implements Parcelable { return cgeoapplication.getInstance().saveCache(cache, EnumSet.of(SaveFlag.SAVE_CACHE)); } + public boolean isEmpty() { + return geocodes.isEmpty(); + } + } diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java index b43cf05..53b6ef6 100644 --- a/main/src/cgeo/geocaching/cgeoapplication.java +++ b/main/src/cgeo/geocaching/cgeoapplication.java @@ -22,9 +22,9 @@ import android.os.Message; import java.io.File; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.EnumSet; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -281,10 +281,7 @@ public class cgeoapplication extends Application { return null; } - Set<String> geocodeList = new HashSet<String>(); - geocodeList.add(geocode); - - return getBounds(geocodeList); + return getBounds(Collections.singleton(geocode)); } /** {@link cgData#getBounds(Set)} */ diff --git a/main/src/cgeo/geocaching/connector/gc/GCBase.java b/main/src/cgeo/geocaching/connector/gc/GCBase.java index 2f79fab..3ecd31a 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCBase.java +++ b/main/src/cgeo/geocaching/connector/gc/GCBase.java @@ -191,7 +191,7 @@ public class GCBase { Geopoint center = viewport.getCenter(); if ((lastSearchViewport == null) || !lastSearchViewport.isInViewport(center)) { SearchResult search = cgBase.searchByCoords(null, center, Settings.getCacheType(), false); - if (search != null) { + if (search != null && !search.isEmpty()) { List<Number> bounds = cgeoapplication.getInstance().getBounds(search.getGeocodes()); lastSearchViewport = new Viewport(bounds.get(1).doubleValue(), bounds.get(2).doubleValue(), bounds.get(4).doubleValue(), bounds.get(3).doubleValue()); diff --git a/tests/src/cgeo/geocaching/cgBaseTest.java b/tests/src/cgeo/geocaching/cgBaseTest.java index 42765f0..1f80ac6 100644 --- a/tests/src/cgeo/geocaching/cgBaseTest.java +++ b/tests/src/cgeo/geocaching/cgBaseTest.java @@ -179,7 +179,7 @@ public class cgBaseTest extends AbstractResourceInstrumentationTestCase { final String page = getFileContent(R.raw.cache_unpublished); SearchResult result = cgBase.parseCacheFromText(page, null); assertNotNull(result); - assertEquals(0, result.getCount()); + assertTrue(result.isEmpty()); assertEquals(StatusCode.UNPUBLISHED_CACHE, result.getError()); } }
\ No newline at end of file diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java index 00d5810..b85d12c 100644 --- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java @@ -18,7 +18,7 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase { final Viewport viewport = new Viewport(new Geopoint("N 52° 25.369 E 9° 35.499"), new Geopoint("N 52° 25.600 E 9° 36.200")); SearchResult searchResult = ConnectorFactory.searchByViewport(viewport, tokens); assertNotNull(searchResult); - assertTrue(searchResult.getCount() >= 1); + assertFalse(searchResult.isEmpty()); assertTrue(searchResult.getGeocodes().contains("GC211WG")); // Spiel & Sport GC211WG N 52° 25.413 E 009° 36.049 } |