diff options
| author | Bananeweizen <Bananeweizen@gmx.de> | 2013-08-14 08:34:38 -0700 |
|---|---|---|
| committer | Bananeweizen <Bananeweizen@gmx.de> | 2013-08-14 08:34:38 -0700 |
| commit | 33e84d8ac8619fdf174d0816e38bf25fdba9be91 (patch) | |
| tree | 614d823f27103525d19cf585c84b102ab17e060d /main/src/cgeo/geocaching/connector/gc | |
| parent | 68c354d596249eff0d08b02483dfa3b94c0518fc (diff) | |
| parent | 8617a044dd3d96f865b675dc50b95f72e6a749dd (diff) | |
| download | cgeo-33e84d8ac8619fdf174d0816e38bf25fdba9be91.zip cgeo-33e84d8ac8619fdf174d0816e38bf25fdba9be91.tar.gz cgeo-33e84d8ac8619fdf174d0816e38bf25fdba9be91.tar.bz2 | |
Merge pull request #3128 from rsudev/issue3104
Fixes #3104, Wrong parsed cache type not corrected by nearby search and/...
Diffstat (limited to 'main/src/cgeo/geocaching/connector/gc')
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCMap.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/IconDecoder.java | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCMap.java b/main/src/cgeo/geocaching/connector/gc/GCMap.java index a213742..85873af 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCMap.java +++ b/main/src/cgeo/geocaching/connector/gc/GCMap.java @@ -217,7 +217,7 @@ public class GCMap { } } } else { - cache.setType(CacheType.UNKNOWN); + cache.setType(CacheType.UNKNOWN, tile.getZoomLevel()); } boolean exclude = false; diff --git a/main/src/cgeo/geocaching/connector/gc/IconDecoder.java b/main/src/cgeo/geocaching/connector/gc/IconDecoder.java index ed44392..c7b470a 100644 --- a/main/src/cgeo/geocaching/connector/gc/IconDecoder.java +++ b/main/src/cgeo/geocaching/connector/gc/IconDecoder.java @@ -1,8 +1,8 @@ package cgeo.geocaching.connector.gc; import cgeo.geocaching.Geocache; -import cgeo.geocaching.settings.Settings; import cgeo.geocaching.enumerations.CacheType; +import cgeo.geocaching.settings.Settings; import android.graphics.Bitmap; @@ -87,19 +87,19 @@ public abstract class IconDecoder { if (count > 1) { // 2 pixels need to detect same type and we say good to go switch (type) { case CT_TRADITIONAL: - cache.setType(CacheType.TRADITIONAL); + cache.setType(CacheType.TRADITIONAL, zoomlevel); return true; case CT_MULTI: - cache.setType(CacheType.MULTI); + cache.setType(CacheType.MULTI, zoomlevel); return true; case CT_MYSTERY: - cache.setType(CacheType.MYSTERY); + cache.setType(CacheType.MYSTERY, zoomlevel); return true; case CT_EVENT: - cache.setType(CacheType.EVENT); + cache.setType(CacheType.EVENT, zoomlevel); return true; case CT_EARTH: - cache.setType(CacheType.EARTH); + cache.setType(CacheType.EARTH, zoomlevel); return true; case CT_FOUND: cache.setFound(true); @@ -108,22 +108,22 @@ public abstract class IconDecoder { cache.setOwnerUserId(Settings.getUsername()); return true; case CT_MEGAEVENT: - cache.setType(CacheType.MEGA_EVENT); + cache.setType(CacheType.MEGA_EVENT, zoomlevel); return true; case CT_CITO: - cache.setType(CacheType.CITO); + cache.setType(CacheType.CITO, zoomlevel); return true; case CT_WEBCAM: - cache.setType(CacheType.WEBCAM); + cache.setType(CacheType.WEBCAM, zoomlevel); return true; case CT_WHERIGO: - cache.setType(CacheType.WHERIGO); + cache.setType(CacheType.WHERIGO, zoomlevel); return true; case CT_VIRTUAL: - cache.setType(CacheType.VIRTUAL); + cache.setType(CacheType.VIRTUAL, zoomlevel); return true; case CT_LETTERBOX: - cache.setType(CacheType.LETTERBOX); + cache.setType(CacheType.LETTERBOX, zoomlevel); return true; } } |