summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Paczos <lukasz.paczos@mapbox.com>2018-02-22 10:01:48 +0100
committerŁukasz Paczos <lukas.paczos@gmail.com>2018-03-01 09:23:03 +0100
commit87d1fa1f4f9d9d86942160ae83c05c7d9e84b4a2 (patch)
treec8020fe6f763fb8ac034f189bd3e005b57cc1a4a
parent936d92a4111dbc4c04eaacd7b96f957f8c9445f8 (diff)
downloadqtlocation-mapboxgl-upstream/lp-cp-11262.tar.gz
[android] expose ImageSource coordinates setter (#11262)upstream/lp-cp-11262
(cherry picked from commit fcf5fa6)
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java11
-rw-r--r--platform/android/src/style/sources/image_source.cpp8
-rw-r--r--platform/android/src/style/sources/image_source.hpp2
3 files changed, 20 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java
index 84e5e96fa4..b7679b5a16 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java
@@ -124,6 +124,15 @@ public class ImageSource extends Source {
return nativeGetUrl();
}
+ /**
+ * Updates the latitude and longitude of the four corners of the image
+ *
+ * @param latLngQuad latitude and longitude of the four corners of the image
+ */
+ public void setCoordinates(LatLngQuad latLngQuad) {
+ nativeSetCoordinates(latLngQuad);
+ }
+
protected native void initialize(String layerId, LatLngQuad payload);
protected native void nativeSetUrl(String url);
@@ -132,6 +141,8 @@ public class ImageSource extends Source {
protected native void nativeSetImage(Bitmap bitmap);
+ protected native void nativeSetCoordinates(LatLngQuad latLngQuad);
+
@Override
protected native void finalize() throws Throwable;
}
diff --git a/platform/android/src/style/sources/image_source.cpp b/platform/android/src/style/sources/image_source.cpp
index 0cd6995969..249387ea51 100644
--- a/platform/android/src/style/sources/image_source.cpp
+++ b/platform/android/src/style/sources/image_source.cpp
@@ -45,6 +45,11 @@ namespace android {
source.as<mbgl::style::ImageSource>()->setImage(Bitmap::GetImage(env, bitmap));
}
+ void ImageSource::setCoordinates(jni::JNIEnv& env, jni::Object<LatLngQuad> coordinatesObject) {
+ source.as<mbgl::style::ImageSource>()->setCoordinates(
+ LatLngQuad::getLatLngArray(env, coordinatesObject));
+ }
+
jni::Class<ImageSource> ImageSource::javaClass;
jni::Object<Source> ImageSource::createJavaPeer(jni::JNIEnv& env) {
@@ -66,7 +71,8 @@ namespace android {
"finalize",
METHOD(&ImageSource::setURL, "nativeSetUrl"),
METHOD(&ImageSource::getURL, "nativeGetUrl"),
- METHOD(&ImageSource::setImage, "nativeSetImage")
+ METHOD(&ImageSource::setImage, "nativeSetImage"),
+ METHOD(&ImageSource::setCoordinates, "nativeSetCoordinates")
);
}
diff --git a/platform/android/src/style/sources/image_source.hpp b/platform/android/src/style/sources/image_source.hpp
index f0af28d357..6021a03dc3 100644
--- a/platform/android/src/style/sources/image_source.hpp
+++ b/platform/android/src/style/sources/image_source.hpp
@@ -30,6 +30,8 @@ public:
void setImage(jni::JNIEnv&, jni::Object<Bitmap>);
+ void setCoordinates(jni::JNIEnv&, jni::Object<LatLngQuad>);
+
private:
jni::Object<Source> createJavaPeer(jni::JNIEnv&);