From 468a43b9a408c67f7693a4f0b7e5a4f531e7db6b Mon Sep 17 00:00:00 2001 From: blafoo Date: Sat, 17 Mar 2012 10:12:53 +0100 Subject: Non-reliable coords for Basic Members. Fixes #1285 --- main/src/cgeo/geocaching/cgBase.java | 6 +----- main/src/cgeo/geocaching/files/LocParser.java | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'main/src') diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java index 0023499..fb5b23a 100644 --- a/main/src/cgeo/geocaching/cgBase.java +++ b/main/src/cgeo/geocaching/cgBase.java @@ -314,7 +314,7 @@ public class cgBase { recaptchaText = thread.getText(); } - if (cids.size() > 0 && (recaptchaChallenge == null || StringUtils.isNotBlank(recaptchaText))) { + if (cids.size() > 0 && (Settings.isPremiumMember() || showCaptcha) && (recaptchaChallenge == null || StringUtils.isNotBlank(recaptchaText))) { Log.i(Settings.tag, "Trying to get .loc for " + cids.size() + " caches"); try { @@ -355,10 +355,6 @@ public class cgBase { LocParser.parseLoc(searchResult, coordinates); - // now we have the coords... - for (cgCache cache : searchResult.getCachesFromSearchResult(LoadFlags.LOAD_CACHE_OR_DB)) { - cache.setReliableLatLon(true); - } } catch (Exception e) { Log.e(Settings.tag, "cgBase.parseSearch.CIDs: " + e.toString()); } diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java index 6dfc70d..029d049 100644 --- a/main/src/cgeo/geocaching/files/LocParser.java +++ b/main/src/cgeo/geocaching/files/LocParser.java @@ -70,6 +70,7 @@ public final class LocParser extends FileParser { cache.setTerrain(coord.getTerrain()); cache.setSize(coord.getSize()); cache.setGeocode(coord.getGeocode().toUpperCase()); + cache.setReliableLatLon(true); if (StringUtils.isBlank(cache.getName())) { cache.setName(coord.getName()); } -- cgit v1.1