aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/cgCache.java
diff options
context:
space:
mode:
authorblafoo <github@blafoo.de>2012-02-29 22:36:18 +0100
committerblafoo <github@blafoo.de>2012-02-29 22:36:18 +0100
commit3fde9652fdc7c7285e4aa00a447df2ae4359b8d9 (patch)
tree4023b13efd8bb326ab2332daee9785e5e4ae36fb /main/src/cgeo/geocaching/cgCache.java
parentd66464638a5be700b4e54d33cfed65f518031f6d (diff)
downloadcgeo-3fde9652fdc7c7285e4aa00a447df2ae4359b8d9.zip
cgeo-3fde9652fdc7c7285e4aa00a447df2ae4359b8d9.tar.gz
cgeo-3fde9652fdc7c7285e4aa00a447df2ae4359b8d9.tar.bz2
Displaying changed caches in the Live Map. Improves #1184
Diffstat (limited to 'main/src/cgeo/geocaching/cgCache.java')
-rw-r--r--main/src/cgeo/geocaching/cgCache.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index f7d503e..f1f231a 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -211,8 +211,12 @@ public class cgCache implements ICache {
location = other.location;
}
if (coords == null) {
- coords = other.getCoords();
+ coords = other.coords;
+ }
+ if (zoomlevel < other.zoomlevel) {
+ coords = other.coords;
}
+
if (elevation == null) {
elevation = other.elevation;
}
@@ -269,6 +273,9 @@ public class cgCache implements ICache {
if (reliableLatLon == false) {
reliableLatLon = other.reliableLatLon;
}
+ if (zoomlevel == -1) {
+ zoomlevel = other.zoomlevel;
+ }
boolean isEqual = isEqualTo(other);