diff options
author | Kevin Li <kevin.li@mapbox.com> | 2020-03-24 14:33:54 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-24 14:33:54 +0800 |
commit | 3f45b0a24b5b608dfa75c84308d1ab0deb6159ee (patch) | |
tree | 31d3d4ced5b4004ee1a3ea27d683a148c04cbe22 /platform/android/src/style/layers/fill_extrusion_layer.cpp | |
parent | 1adc436c9d883663b2d6fb0cb9014043fa7bc2b6 (diff) | |
download | qtlocation-mapboxgl-3f45b0a24b5b608dfa75c84308d1ab0deb6159ee.tar.gz |
[android] Add jni binding for styleable snapshotter (#16286)
* [android] Add jni binding for styleable snapshotter
* Remove Map parameter from factories
- remove unused map from factory interfaces. Map is only needed for repaint.
* implement addlayer function
* Implement addsource function for snapshotter
* Implement addImages function
* format codes
* Apply baseline
* Update CHANGELOG.md
* Update map_snapshotter.cpp
* Destroy snapshotter on the thread it was created
* Activate file sources in start
* Use custom deleter for snapshotter
* format codes
* Release snapshotter pointer to deleting lambda
* Clang format
* Update CHANGELOG.md
* Fix review comments
* FIx review comments
Co-authored-by: Alexander Shalamov <alexander.shalamov@mapbox.com>
Diffstat (limited to 'platform/android/src/style/layers/fill_extrusion_layer.cpp')
-rw-r--r-- | platform/android/src/style/layers/fill_extrusion_layer.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/platform/android/src/style/layers/fill_extrusion_layer.cpp b/platform/android/src/style/layers/fill_extrusion_layer.cpp index ddfbd71544..55c3d20282 100644 --- a/platform/android/src/style/layers/fill_extrusion_layer.cpp +++ b/platform/android/src/style/layers/fill_extrusion_layer.cpp @@ -26,16 +26,13 @@ namespace android { /** * Creates a non-owning peer object (for layers currently attached to the map) */ - FillExtrusionLayer::FillExtrusionLayer(mbgl::Map& map, mbgl::style::FillExtrusionLayer& coreLayer) - : Layer(map, coreLayer) { - } + FillExtrusionLayer::FillExtrusionLayer(mbgl::style::FillExtrusionLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ - FillExtrusionLayer::FillExtrusionLayer(mbgl::Map& map, std::unique_ptr<mbgl::style::FillExtrusionLayer> coreLayer) - : Layer(map, std::move(coreLayer)) { - } + FillExtrusionLayer::FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer> coreLayer) + : Layer(std::move(coreLayer)) {} FillExtrusionLayer::~FillExtrusionLayer() = default; @@ -172,14 +169,18 @@ namespace android { } } // namespace - jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, mbgl::style::Layer& layer) { + jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, + mbgl::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); - return createJavaPeer(env, new FillExtrusionLayer(map, toFillExtrusionLayer(layer))); + return createJavaPeer(env, new FillExtrusionLayer(toFillExtrusionLayer(layer))); } - jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, std::unique_ptr<mbgl::style::Layer> layer) { + jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer( + jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); - return createJavaPeer(env, new FillExtrusionLayer(map, std::unique_ptr<mbgl::style::FillExtrusionLayer>(static_cast<mbgl::style::FillExtrusionLayer*>(layer.release())))); + return createJavaPeer(env, + new FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer>( + static_cast<mbgl::style::FillExtrusionLayer*>(layer.release())))); } void FillExtrusionJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -190,7 +191,9 @@ namespace android { // Register the peer jni::RegisterNativePeer<FillExtrusionLayer>( - env, javaClass, "nativePtr", + env, + javaClass, + "nativePtr", jni::MakePeer<FillExtrusionLayer, jni::String&, jni::String&>, "initialize", "finalize", @@ -200,8 +203,10 @@ namespace android { METHOD(&FillExtrusionLayer::getFillExtrusionColorTransition, "nativeGetFillExtrusionColorTransition"), METHOD(&FillExtrusionLayer::setFillExtrusionColorTransition, "nativeSetFillExtrusionColorTransition"), METHOD(&FillExtrusionLayer::getFillExtrusionColor, "nativeGetFillExtrusionColor"), - METHOD(&FillExtrusionLayer::getFillExtrusionTranslateTransition, "nativeGetFillExtrusionTranslateTransition"), - METHOD(&FillExtrusionLayer::setFillExtrusionTranslateTransition, "nativeSetFillExtrusionTranslateTransition"), + METHOD(&FillExtrusionLayer::getFillExtrusionTranslateTransition, + "nativeGetFillExtrusionTranslateTransition"), + METHOD(&FillExtrusionLayer::setFillExtrusionTranslateTransition, + "nativeSetFillExtrusionTranslateTransition"), METHOD(&FillExtrusionLayer::getFillExtrusionTranslate, "nativeGetFillExtrusionTranslate"), METHOD(&FillExtrusionLayer::getFillExtrusionTranslateAnchor, "nativeGetFillExtrusionTranslateAnchor"), METHOD(&FillExtrusionLayer::getFillExtrusionPatternTransition, "nativeGetFillExtrusionPatternTransition"), |