summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorTobrun Van Nuland <nurbot@Tobruns-Mac-mini.local>2016-05-24 14:13:28 +0200
committerTobrun Van Nuland <tobrun.van.nuland@gmail.com>2016-05-25 13:07:54 +0200
commit1d7d8a9f2f39de2ae2425a9d440ce5c4151d1885 (patch)
tree955816047f6342eb3d1c576eaf0490451ea1f3f7 /platform/android
parent9c9140595e9c1d9a12120e167421034f6036b08a (diff)
downloadqtlocation-mapboxgl-1d7d8a9f2f39de2ae2425a9d440ce5c4151d1885.tar.gz
[android] #5102 - update marker view position correctly by comparing markers based on id instead of location
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java17
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java4
2 files changed, 2 insertions, 19 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
index dc83b6fc87..16b219684f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
@@ -167,23 +167,6 @@ public class Marker extends Annotation {
}
@Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- if (!super.equals(o)) return false;
-
- Marker marker = (Marker) o;
- return !(getPosition() != null ? !getPosition().equals(marker.getPosition()) : marker.getPosition() != null);
- }
-
- @Override
- public int hashCode() {
- int result = super.hashCode();
- result = 31 * result + (getPosition() != null ? getPosition().hashCode() : 0);
- return result;
- }
-
- @Override
public String toString() {
return "Marker [position[" + getPosition() + "]]";
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java
index bc73e0d1a5..a55672e86b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java
@@ -70,8 +70,8 @@ public class MarkerTest {
@Test
public void testHashCode() {
- Marker marker = new MarkerOptions().position(new LatLng(10, 12)).getMarker();
- assertEquals("hash code should match", marker.hashCode(), -1946419200);
+ Marker marker = new MarkerOptions().getMarker();
+ assertEquals("hash code should match", marker.hashCode(), 0);
}
@Test