[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>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user