diff options
| author | Brad Leege <bleege@gmail.com> | 2016-06-09 14:35:10 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2016-06-09 14:35:10 -0500 |
| commit | b90571107d6fa5dd970d77c0b67029de8cd3461a (patch) | |
| tree | db6e2015be88f435b6e890fc9a5cf6a305e2a815 /platform/android/MapboxGLAndroidSDK/src/main/java | |
| parent | d67b88dba94a5e50eabaa8c133bb66fc3da8ee6f (diff) | |
| download | qtlocation-mapboxgl-b90571107d6fa5dd970d77c0b67029de8cd3461a.tar.gz | |
[android] #5291 - Fixing merge conflicts
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java')
| -rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index e92e310c63..a93263a917 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -371,9 +371,7 @@ final class NativeMapView { } public void updateMarker(Marker marker) { - LatLng position = marker.getPosition(); - Icon icon = marker.getIcon(); - nativeUpdateMarker(mNativeMapViewPtr, marker.getId(), position.getLatitude(), position.getLongitude(), icon.getId()); + nativeUpdateMarker(mNativeMapViewPtr, marker); } public void removeAnnotation(long id) { |