diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-03-12 13:17:02 +0200 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-03-13 02:18:29 +0200 |
commit | c4502372e690b60ad9d4dea430531a1463fac635 (patch) | |
tree | ad3e8a62b2a569ef075995fba59900746017de64 /platform/android/src/style/layers/hillshade_layer.cpp | |
parent | d9d0cbcc6b1ec0c3eb0841e84561498ac1a067d4 (diff) | |
download | qtlocation-mapboxgl-upstream/alexshalamov_android_snapshotter.tar.gz |
Remove Map parameter from factoriesupstream/alexshalamov_android_snapshotter
- remove unused map from factory interfaces. Map is only needed for repaint.
Diffstat (limited to 'platform/android/src/style/layers/hillshade_layer.cpp')
-rw-r--r-- | platform/android/src/style/layers/hillshade_layer.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/platform/android/src/style/layers/hillshade_layer.cpp b/platform/android/src/style/layers/hillshade_layer.cpp index bc25f666a0..3c72b503b7 100644 --- a/platform/android/src/style/layers/hillshade_layer.cpp +++ b/platform/android/src/style/layers/hillshade_layer.cpp @@ -26,15 +26,15 @@ namespace android { /** * Creates a non-owning peer object (for layers currently attached to the map) */ - HillshadeLayer::HillshadeLayer(mbgl::Map& map, mbgl::style::HillshadeLayer& coreLayer) - : Layer(map, coreLayer) { + HillshadeLayer::HillshadeLayer(mbgl::style::HillshadeLayer& coreLayer) + : Layer(coreLayer) { } /** * Creates an owning peer object (for layers not attached to the map) */ - HillshadeLayer::HillshadeLayer(mbgl::Map& map, std::unique_ptr<mbgl::style::HillshadeLayer> coreLayer) - : Layer(map, std::move(coreLayer)) { + HillshadeLayer::HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer> coreLayer) + : Layer(std::move(coreLayer)) { } HillshadeLayer::~HillshadeLayer() = default; @@ -136,14 +136,14 @@ namespace android { } } // namespace - jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, mbgl::style::Layer& layer) { + jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); - return createJavaPeer(env, new HillshadeLayer(map, toHillshadeLayer(layer))); + return createJavaPeer(env, new HillshadeLayer(toHillshadeLayer(layer))); } - jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, std::unique_ptr<mbgl::style::Layer> layer) { + jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); - return createJavaPeer(env, new HillshadeLayer(map, std::unique_ptr<mbgl::style::HillshadeLayer>(static_cast<mbgl::style::HillshadeLayer*>(layer.release())))); + return createJavaPeer(env, new HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer>(static_cast<mbgl::style::HillshadeLayer*>(layer.release())))); } void HillshadeJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -154,7 +154,9 @@ namespace android { // Register the peer jni::RegisterNativePeer<HillshadeLayer>( - env, javaClass, "nativePtr", + env, + javaClass, + "nativePtr", jni::MakePeer<HillshadeLayer, jni::String&, jni::String&>, "initialize", "finalize", |