diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-05-28 10:14:25 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-05-28 10:14:25 +0200 |
| commit | a89e683d216baae38bc5711848f3516833f5e18b (patch) | |
| tree | 1286b3067deeffc18a13345cb5d32551fc3df397 /main/src/cgeo/geocaching/connector/gc/GCParser.java | |
| parent | 4733c57263fb74e498f4c7d5b8edcab967c45c6b (diff) | |
| parent | 140c1fd3573811596900e9ae7bae713ba8803f93 (diff) | |
| download | cgeo-a89e683d216baae38bc5711848f3516833f5e18b.zip cgeo-a89e683d216baae38bc5711848f3516833f5e18b.tar.gz cgeo-a89e683d216baae38bc5711848f3516833f5e18b.tar.bz2 | |
Merge branch 'release' into upstream
Diffstat (limited to 'main/src/cgeo/geocaching/connector/gc/GCParser.java')
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCParser.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index 659f0d0..1d40314 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -167,13 +167,15 @@ public abstract class GCParser { // cache direction - image if (Settings.getLoadDirImg()) { final String direction = BaseUtils.getMatch(row, GCConstants.PATTERN_SEARCH_DIRECTION_DISTANCE, false, 1, null, false); - final String distance = BaseUtils.getMatch(row, GCConstants.PATTERN_SEARCH_DIRECTION_DISTANCE, false, 2, null, false); if (direction != null) { cache.setDirectionImg(direction); } - if (distance != null) { - cache.setDistance(DistanceParser.parseDistance(distance, Settings.isUseMetricUnits())); - } + } + + // cache distance - estimated distance for basic members + final String distance = BaseUtils.getMatch(row, GCConstants.PATTERN_SEARCH_DIRECTION_DISTANCE, false, 2, null, false); + if (distance != null) { + cache.setDistance(DistanceParser.parseDistance(distance, Settings.isUseMetricUnits())); } // difficulty/terrain |