diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-01 13:39:15 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-01 15:10:28 -0800 |
| commit | 8afa14fa78e628007a983d00efa336674e499735 (patch) | |
| tree | 8a003ea8f9e9739af53858af39feb68b367621ae /android | |
| parent | 8a66b7047f899b781922986b63ecbe9039fcfafc (diff) | |
| download | qtlocation-mapboxgl-8afa14fa78e628007a983d00efa336674e499735.tar.gz | |
[core] Map::setSprite ⇢ Map::addAnnotationIcon
Fixes #3084
Diffstat (limited to 'android')
| -rw-r--r-- | android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java | 2 | ||||
| -rw-r--r-- | android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java index ec805fdfa1..405eb0cbcb 100644 --- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java +++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java @@ -1723,7 +1723,7 @@ public final class MapView extends FrameLayout { } float scale = density / DisplayMetrics.DENSITY_DEFAULT; - mNativeMapView.setSprite( + mNativeMapView.addAnnotationIcon( id, (int) (bitmap.getWidth() / scale), (int) (bitmap.getHeight() / scale), diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java index 6f34ecc843..e05ca6b67a 100644 --- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java +++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java @@ -385,8 +385,8 @@ final class NativeMapView { return nativeGetAnnotationsInBounds(mNativeMapViewPtr, bbox); } - public void setSprite(String symbol, int width, int height, float scale, byte[] pixels) { - nativeSetSprite(mNativeMapViewPtr, symbol, width, height, scale, pixels); + public void addAnnotationIcon(String symbol, int width, int height, float scale, byte[] pixels) { + nativeAddAnnotationIcon(mNativeMapViewPtr, symbol, width, height, scale, pixels); } public void setVisibleCoordinateBounds(LatLng[] coordinates, RectF padding, double direction, long duration) { @@ -588,7 +588,7 @@ final class NativeMapView { private native long[] nativeGetAnnotationsInBounds(long mNativeMapViewPtr, BoundingBox bbox); - private native void nativeSetSprite(long nativeMapViewPtr, String symbol, + private native void nativeAddAnnotationIcon(long nativeMapViewPtr, String symbol, int width, int height, float scale, byte[] pixels); private native void nativeSetVisibleCoordinateBounds(long mNativeMapViewPtr, LatLng[] coordinates, |