[android] #5303 - Updating code to take properly merge what each branch intended for nativeUpdateMarker

This commit is contained in:
Brad Leege
2016-06-09 16:49:51 -05:00
parent acfa2ce0fd
commit 511801c17a
2 changed files with 8 additions and 20 deletions

View File

@@ -371,7 +371,9 @@ final class NativeMapView {
}
public void updateMarker(Marker marker) {
nativeUpdateMarker(mNativeMapViewPtr, marker);
LatLng position = marker.getPosition();
Icon icon = marker.getIcon();
nativeUpdateMarker(mNativeMapViewPtr, marker.getId(), position.getLatitude(), position.getLongitude(), icon.getId());
}
public void removeAnnotation(long id) {
@@ -589,7 +591,7 @@ final class NativeMapView {
private native void nativeResetNorth(long nativeMapViewPtr);
private native void nativeUpdateMarker(long nativeMapViewPtr, Marker marker);
private native void nativeUpdateMarker(long nativeMapViewPtr, long markerId, double lat, double lon, String iconId);
private native long[] nativeAddMarkers(long nativeMapViewPtr, Marker[] markers);