From ff09c94d0825f5dbe7dddce52b64e74d61978976 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Thu, 15 Nov 2018 15:47:25 +0200 Subject: [core][android] Introduce mbgl::style::LayerTypeInfo The `LayerTypeInfo` contains static meta data about certain layer type. Each layer module should have a single immutable `LayerTypeInfo` instance for the represented layer type. Both `LayerImpl` and `LayerFactory` from the module always refer to the same `LayerTypeInfo` instance, so address of this instance can be used as a layer module Id during the process life time. --- platform/android/src/style/layers/fill_layer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'platform/android/src/style/layers/fill_layer.cpp') diff --git a/platform/android/src/style/layers/fill_layer.cpp b/platform/android/src/style/layers/fill_layer.cpp index 252771038a..c54f4cd39d 100644 --- a/platform/android/src/style/layers/fill_layer.cpp +++ b/platform/android/src/style/layers/fill_layer.cpp @@ -155,12 +155,12 @@ namespace android { } // namespace jni::Local> FillJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, mbgl::style::Layer& layer) { - assert(layer.baseImpl->getLayerFactory() == this); + assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new FillLayer(map, toFillLayer(layer))); } jni::Local> FillJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::Map& map, std::unique_ptr layer) { - assert(layer->baseImpl->getLayerFactory() == this); + assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new FillLayer(map, std::unique_ptr(static_cast(layer.release())))); } -- cgit v1.2.1