tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #5102 - update marker view position correctly by comparing markers based on id instead of location

Browse Source
This commit is contained in:
Tobrun Van Nuland
2016-05-24 14:13:28 +02:00
committed by Tobrun Van Nuland
parent 9c9140595e
commit 1d7d8a9f2f
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
View File

@@ -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() + "]]";

4
platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java
View File

@@ -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