summaryrefslogtreecommitdiff
path: root/platform/android/src/style/layers/custom_layer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'platform/android/src/style/layers/custom_layer.cpp')
-rw-r--r--platform/android/src/style/layers/custom_layer.cpp41
1 files changed, 16 insertions, 25 deletions
diff --git a/platform/android/src/style/layers/custom_layer.cpp b/platform/android/src/style/layers/custom_layer.cpp
index 3f44aa8505..5a8b239a8d 100644
--- a/platform/android/src/style/layers/custom_layer.cpp
+++ b/platform/android/src/style/layers/custom_layer.cpp
@@ -14,25 +14,12 @@ namespace android {
) {
}
- CustomLayer::CustomLayer(mbgl::Map& map, mbgl::style::CustomLayer& coreLayer)
- : Layer(map, coreLayer) {
- }
+ CustomLayer::CustomLayer(mbgl::style::CustomLayer& coreLayer) : Layer(coreLayer) {}
- CustomLayer::CustomLayer(mbgl::Map& map, std::unique_ptr<mbgl::style::CustomLayer> coreLayer)
- : Layer(map, std::move(coreLayer)) {
- }
+ CustomLayer::CustomLayer(std::unique_ptr<mbgl::style::CustomLayer> coreLayer) : Layer(std::move(coreLayer)) {}
CustomLayer::~CustomLayer() = default;
- void CustomLayer::update(jni::JNIEnv&) {
- Log::Debug(mbgl::Event::JNI, "Updating map");
- if (map) {
- map->triggerRepaint();
- } else {
- Log::Error(mbgl::Event::JNI, "No map reference, cannot update");
- }
- }
-
namespace {
jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
static auto& javaClass = jni::Class<CustomLayer>::Singleton(env);
@@ -43,12 +30,16 @@ namespace android {
CustomJavaLayerPeerFactory::~CustomJavaLayerPeerFactory() = default;
- jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, mbgl::style::Layer& layer) {
- return createJavaPeer(env, new CustomLayer(map, static_cast<mbgl::style::CustomLayer&>(layer)));
+ jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+ mbgl::style::Layer& layer) {
+ return createJavaPeer(env, new CustomLayer(static_cast<mbgl::style::CustomLayer&>(layer)));
}
- jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, std::unique_ptr<mbgl::style::Layer> layer) {
- return createJavaPeer(env, new CustomLayer(map, std::unique_ptr<mbgl::style::CustomLayer>(static_cast<mbgl::style::CustomLayer*>(layer.release()))));
+ jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(
+ jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+ return createJavaPeer(env,
+ new CustomLayer(std::unique_ptr<mbgl::style::CustomLayer>(
+ static_cast<mbgl::style::CustomLayer*>(layer.release()))));
}
void CustomJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -58,12 +49,12 @@ namespace android {
#define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
// Register the peer
- jni::RegisterNativePeer<CustomLayer>(
- env, javaClass, "nativePtr",
- jni::MakePeer<CustomLayer, const jni::String&, jni::jlong>,
- "initialize",
- "finalize",
- METHOD(&CustomLayer::update, "nativeUpdate"));
+ jni::RegisterNativePeer<CustomLayer>(env,
+ javaClass,
+ "nativePtr",
+ jni::MakePeer<CustomLayer, const jni::String&, jni::jlong>,
+ "initialize",
+ "finalize");
}
} // namespace android