80ec05cf47
The newly introduced `LayerManagerAndroid` is now responsible for creating both style layer objects and their java peers on Android.
71 lines
2.6 KiB
C++
71 lines
2.6 KiB
C++
#include "custom_layer.hpp"
|
|
|
|
#include <string>
|
|
|
|
#include <mbgl/util/logging.hpp>
|
|
|
|
namespace mbgl {
|
|
namespace android {
|
|
|
|
CustomLayer::CustomLayer(jni::JNIEnv& env, const jni::String& layerId, jni::jlong host)
|
|
: Layer(std::make_unique<mbgl::style::CustomLayer>(
|
|
jni::Make<std::string>(env, layerId),
|
|
std::unique_ptr<mbgl::style::CustomLayerHost>(reinterpret_cast<mbgl::style::CustomLayerHost*>(host)))
|
|
) {
|
|
}
|
|
|
|
CustomLayer::CustomLayer(mbgl::Map& map, mbgl::style::CustomLayer& coreLayer)
|
|
: Layer(map, coreLayer) {
|
|
}
|
|
|
|
CustomLayer::CustomLayer(mbgl::Map& map, std::unique_ptr<mbgl::style::CustomLayer> coreLayer)
|
|
: Layer(map, 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);
|
|
static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
|
|
return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
|
|
}
|
|
}
|
|
|
|
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::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()))));
|
|
}
|
|
|
|
void CustomJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
|
|
// Lookup the class
|
|
static auto& javaClass = jni::Class<CustomLayer>::Singleton(env);
|
|
|
|
#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"));
|
|
}
|
|
|
|
} // namespace android
|
|
} // namespace mbgl
|