[core][android] Implement LayerManager for Android

The newly introduced `LayerManagerAndroid` is now responsible
for creating both style layer objects and their java peers on Android.
This commit is contained in:
Mikhail Pozdnyakov
2018-11-06 11:25:09 +02:00
parent ffdeef3a26
commit 80ec05cf47
30 changed files with 560 additions and 193 deletions

View File

@@ -7,6 +7,8 @@
#include "../conversion/property_value.hpp"
#include "../conversion/transition_options.hpp"
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace android {
@@ -18,7 +20,7 @@ namespace android {
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
HeatmapLayer::HeatmapLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(env, std::make_unique<mbgl::style::HeatmapLayer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
: Layer(std::make_unique<mbgl::style::HeatmapLayer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
}
/**
@@ -108,13 +110,29 @@ namespace android {
}
jni::Local<jni::Object<Layer>> HeatmapLayer::createJavaPeer(jni::JNIEnv& env) {
static auto& javaClass = jni::Class<HeatmapLayer>::Singleton(env);
static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
// HeatmapJavaLayerPeerFactory
HeatmapJavaLayerPeerFactory::~HeatmapJavaLayerPeerFactory() = default;
namespace {
jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
static auto& javaClass = jni::Class<HeatmapLayer>::Singleton(env);
static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
}
} // namespace
jni::Local<jni::Object<Layer>> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, mbgl::style::Layer& layer) {
assert(layer.baseImpl->getLayerFactory() == this);
return createJavaPeer(env, new HeatmapLayer(map, toHeatmapLayer(layer)));
}
void HeatmapLayer::registerNative(jni::JNIEnv& env) {
jni::Local<jni::Object<Layer>> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, std::unique_ptr<mbgl::style::Layer> layer) {
assert(layer->baseImpl->getLayerFactory() == this);
return createJavaPeer(env, new HeatmapLayer(map, std::unique_ptr<mbgl::style::HeatmapLayer>(static_cast<mbgl::style::HeatmapLayer*>(layer.release()))));
}
void HeatmapJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
// Lookup the class
static auto& javaClass = jni::Class<HeatmapLayer>::Singleton(env);