From 1d7d8a9f2f39de2ae2425a9d440ce5c4151d1885 Mon Sep 17 00:00:00 2001 From: Tobrun Van Nuland Date: Tue, 24 May 2016 14:13:28 +0200 Subject: [PATCH] [android] #5102 - update marker view position correctly by comparing markers based on id instead of location --- .../mapbox/mapboxsdk/annotations/Marker.java | 17 ----------------- .../mapboxsdk/annotations/MarkerTest.java | 4 ++-- 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 dc83b6fc8..16b219684 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 @@ -166,23 +166,6 @@ public class Marker extends Annotation { this.rightOffsetPixels = rightOffsetPixels; } - @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 bc73e0d1a..a55672e86 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