diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-12-02 18:04:06 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-12-03 14:20:17 +0200 |
| commit | 5d46cd662fe5c441618204241f61c986af200f48 (patch) | |
| tree | 37449a128ea6b4c6f4052f370ebadbea095bfd41 /platform/android | |
| parent | 684000fc263ac6c4064e80505bd1a2f6c15fb0fa (diff) | |
| download | qtlocation-mapboxgl-5d46cd662fe5c441618204241f61c986af200f48.tar.gz | |
[android][node][qt] Update platform code for style::Layer::setProperty()
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/src/style/layers/layer.cpp | 28 | ||||
| -rw-r--r-- | platform/android/src/style/layers/layer.hpp | 4 |
2 files changed, 12 insertions, 20 deletions
diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp index 2f335b6ff3..b90d670a4b 100644 --- a/platform/android/src/style/layers/layer.cpp +++ b/platform/android/src/style/layers/layer.cpp @@ -91,18 +91,10 @@ namespace android { return layer; } - void Layer::setLayoutProperty(jni::JNIEnv& env, const jni::String& jname, const jni::Object<>& jvalue) { + void Layer::setProperty(jni::JNIEnv& env, const jni::String& jname, const jni::Object<>& jvalue) { // Convert and set property - optional<mbgl::style::conversion::Error> error = layer.setLayoutProperty(jni::Make<std::string>(env, jname), Value(env, jvalue)); - if (error) { - mbgl::Log::Error(mbgl::Event::JNI, "Error setting property: " + jni::Make<std::string>(env, jname) + " " + error->message); - return; - } - } - - void Layer::setPaintProperty(jni::JNIEnv& env, const jni::String& jname, const jni::Object<>& jvalue) { - // Convert and set property - optional<mbgl::style::conversion::Error> error = layer.setPaintProperty(jni::Make<std::string>(env, jname), Value(env, jvalue)); + optional<mbgl::style::conversion::Error> error = + layer.setProperty(jni::Make<std::string>(env, jname), Value(env, jvalue)); if (error) { mbgl::Log::Error(mbgl::Event::JNI, "Error setting property: " + jni::Make<std::string>(env, jname) + " " + error->message); return; @@ -176,10 +168,14 @@ namespace android { #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name) // Register the peer - jni::RegisterNativePeer<Layer>(env, javaClass, "nativePtr", + jni::RegisterNativePeer<Layer>( + env, + javaClass, + "nativePtr", METHOD(&Layer::getId, "nativeGetId"), - METHOD(&Layer::setLayoutProperty, "nativeSetLayoutProperty"), - METHOD(&Layer::setPaintProperty, "nativeSetPaintProperty"), + METHOD(&Layer::setProperty, + "nativeSetLayoutProperty"), // TODO : Export only nativeSetProperty() when #15970 lands. + METHOD(&Layer::setProperty, "nativeSetPaintProperty"), METHOD(&Layer::setFilter, "nativeSetFilter"), METHOD(&Layer::getFilter, "nativeGetFilter"), METHOD(&Layer::setSourceLayer, "nativeSetSourceLayer"), @@ -189,9 +185,7 @@ namespace android { METHOD(&Layer::getMaxZoom, "nativeGetMaxZoom"), METHOD(&Layer::setMinZoom, "nativeSetMinZoom"), METHOD(&Layer::setMaxZoom, "nativeSetMaxZoom"), - METHOD(&Layer::getVisibility, "nativeGetVisibility") - ); - + METHOD(&Layer::getVisibility, "nativeGetVisibility")); } } // namespace android diff --git a/platform/android/src/style/layers/layer.hpp b/platform/android/src/style/layers/layer.hpp index 0fb679152b..bde351f708 100644 --- a/platform/android/src/style/layers/layer.hpp +++ b/platform/android/src/style/layers/layer.hpp @@ -35,9 +35,7 @@ public: style::Layer& get(); - void setLayoutProperty(jni::JNIEnv&, const jni::String&, const jni::Object<>& value); - - void setPaintProperty(jni::JNIEnv&, const jni::String&, const jni::Object<>& value); + void setProperty(jni::JNIEnv&, const jni::String&, const jni::Object<>& value); // Zoom |