Merge remote-tracking branch 'upstream/master' into master-master

Conflicts:
	main/src/cgeo/geocaching/cgeocaches.java

1 files changed, 9 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/Waypoint.java b/main/src/cgeo/geocaching/Waypoint.java
index 4b014a6..53160e5 100644
--- a/main/src/cgeo/geocaching/Waypoint.java
+++ b/main/src/cgeo/geocaching/Waypoint.java
@@ -269,4 +269,13 @@ public class Waypoint implements IWaypoint, Comparable<Waypoint> {
     public boolean isVisited() {
         return visited;
     }
+
+    public int calculateStaticMapsHashcode() {
+        long hash = 0;
+        if (coords != null) {
+            hash = coords.hashCode();
+        }
+        hash = hash ^ waypointType.markerId;
+        return (int) hash;
+    }
 }