diff options
| author | Bananeweizen <Bananeweizen@gmx.de> | 2012-07-20 09:07:52 -0700 |
|---|---|---|
| committer | Bananeweizen <Bananeweizen@gmx.de> | 2012-07-20 09:07:52 -0700 |
| commit | 9ca1feffb7476edb91f4a81a2200631fa4f7ed2d (patch) | |
| tree | 51e6c935e8c00ca611e356431098c31a348f824f /main/src/cgeo/geocaching/maps/CGeoMap.java | |
| parent | 51883312e45c97f52aa74f669c1bab96643c450a (diff) | |
| parent | a9076cead14617171d2d89f89935f1dde9504522 (diff) | |
| download | cgeo-9ca1feffb7476edb91f4a81a2200631fa4f7ed2d.zip cgeo-9ca1feffb7476edb91f4a81a2200631fa4f7ed2d.tar.gz cgeo-9ca1feffb7476edb91f4a81a2200631fa4f7ed2d.tar.bz2 | |
Merge pull request #1897 from Portree-Kid/Fix1866
Added Filter to loading of waypoints fixes #1866
Diffstat (limited to 'main/src/cgeo/geocaching/maps/CGeoMap.java')
| -rw-r--r-- | main/src/cgeo/geocaching/maps/CGeoMap.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index 062f02f..c4d2192 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -1187,9 +1187,12 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto waypoints.clear(); if (isLiveMode() || mapMode == MapMode.COORDS) { //All visible waypoints - //FIXME apply type filter - waypoints.addAll(app.getWaypointsInViewport(viewport, Settings.isExcludeMyCaches(), Settings.isExcludeDisabledCaches())); - } else { + CacheType type = Settings.getCacheType(); + Set<cgWaypoint> waypointsInViewport = app.getWaypointsInViewport(viewport, Settings.isExcludeMyCaches(), Settings.isExcludeDisabledCaches(), type); + waypoints.addAll(waypointsInViewport); + } + else + { //All waypoints from the viewed caches for (cgCache c : caches.getAsList()) { waypoints.addAll(c.getWaypoints()); |