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. --- include/mbgl/style/layer.hpp | 23 +++++++++- include/mbgl/style/layers/background_layer.hpp | 10 ++--- include/mbgl/style/layers/circle_layer.hpp | 10 ++--- include/mbgl/style/layers/custom_layer.hpp | 8 +--- include/mbgl/style/layers/fill_extrusion_layer.hpp | 10 ++--- include/mbgl/style/layers/fill_layer.hpp | 10 ++--- include/mbgl/style/layers/heatmap_layer.hpp | 10 ++--- include/mbgl/style/layers/hillshade_layer.hpp | 10 ++--- include/mbgl/style/layers/layer.hpp.ejs | 10 ++--- include/mbgl/style/layers/line_layer.hpp | 10 ++--- include/mbgl/style/layers/raster_layer.hpp | 10 ++--- include/mbgl/style/layers/symbol_layer.hpp | 10 ++--- .../android/src/style/layers/background_layer.cpp | 4 +- platform/android/src/style/layers/circle_layer.cpp | 4 +- .../src/style/layers/fill_extrusion_layer.cpp | 4 +- platform/android/src/style/layers/fill_layer.cpp | 4 +- .../android/src/style/layers/heatmap_layer.cpp | 4 +- .../android/src/style/layers/hillshade_layer.cpp | 4 +- platform/android/src/style/layers/layer.cpp.ejs | 4 +- .../android/src/style/layers/layer_manager.cpp | 52 +++++++++++++--------- .../android/src/style/layers/layer_manager.hpp | 2 + platform/android/src/style/layers/line_layer.cpp | 4 +- platform/android/src/style/layers/raster_layer.cpp | 4 +- platform/android/src/style/layers/symbol_layer.cpp | 4 +- platform/default/layer_manager.cpp | 46 ++++++++++++------- src/mbgl/style/layer.cpp | 4 ++ src/mbgl/style/layer_impl.hpp | 3 +- src/mbgl/style/layers/background_layer.cpp | 25 ++++------- src/mbgl/style/layers/background_layer_impl.hpp | 2 +- src/mbgl/style/layers/circle_layer.cpp | 25 ++++------- src/mbgl/style/layers/circle_layer_impl.hpp | 2 +- src/mbgl/style/layers/custom_layer.cpp | 23 +++++----- src/mbgl/style/layers/custom_layer_impl.cpp | 4 -- src/mbgl/style/layers/custom_layer_impl.hpp | 2 +- src/mbgl/style/layers/fill_extrusion_layer.cpp | 25 ++++------- .../style/layers/fill_extrusion_layer_impl.hpp | 2 +- src/mbgl/style/layers/fill_layer.cpp | 25 ++++------- src/mbgl/style/layers/fill_layer_impl.hpp | 2 +- src/mbgl/style/layers/heatmap_layer.cpp | 25 ++++------- src/mbgl/style/layers/heatmap_layer_impl.hpp | 2 +- src/mbgl/style/layers/hillshade_layer.cpp | 25 ++++------- src/mbgl/style/layers/hillshade_layer_impl.hpp | 2 +- src/mbgl/style/layers/layer.cpp.ejs | 29 ++++++------ src/mbgl/style/layers/line_layer.cpp | 25 ++++------- src/mbgl/style/layers/line_layer_impl.hpp | 2 +- src/mbgl/style/layers/raster_layer.cpp | 25 ++++------- src/mbgl/style/layers/raster_layer_impl.hpp | 2 +- src/mbgl/style/layers/symbol_layer.cpp | 25 ++++------- src/mbgl/style/layers/symbol_layer_impl.hpp | 2 +- 49 files changed, 256 insertions(+), 323 deletions(-) diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp index 1e1e97dd0d..21ed3adbce 100644 --- a/include/mbgl/style/layer.hpp +++ b/include/mbgl/style/layer.hpp @@ -18,6 +18,21 @@ namespace style { class LayerObserver; class Filter; +/** + * @brief Holds static data for a certain layer type. + */ +struct LayerTypeInfo { + /** + * @brief contains the layer type as defined in the style specification; + */ + const char* type; + /** + * @brief contains \c SourceRequired if the corresponding layer type requires source; + * contains \c SourceNotRequired otherwise. + */ + const enum { SourceRequired, SourceNotRequired } source; +}; + /** * The runtime representation of a [layer](https://www.mapbox.com/mapbox-gl-style-spec/#layers) from the Mapbox Style * Specification. @@ -83,12 +98,16 @@ public: // identical platform-native peers. util::peer peer; Layer(Immutable); + + const LayerTypeInfo* getTypeInfo() const noexcept; + protected: virtual Mutable mutableBaseImpl() const = 0; LayerObserver* observer; }; + /** * @brief The LayerFactory abstract class * @@ -97,8 +116,8 @@ protected: class LayerFactory { public: virtual ~LayerFactory() = default; - /// Returns \c true if this factory can produce layers of the given type of the layers; returns \c false otherwise. - virtual bool supportsType(const std::string& type) const noexcept = 0; + /// Returns the layer type data. + virtual const LayerTypeInfo* getTypeInfo() const noexcept = 0; /// Returns a new Layer instance on success call; returns `nulltptr` otherwise. virtual std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) = 0; diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp index 639cb5154c..e188a9ba2c 100644 --- a/include/mbgl/style/layers/background_layer.hpp +++ b/include/mbgl/style/layers/background_layer.hpp @@ -59,15 +59,11 @@ protected: class BackgroundLayerFactory : public LayerFactory { public: BackgroundLayerFactory(); - // LayerFactory overrides. ~BackgroundLayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static BackgroundLayerFactory* get() noexcept; -private: - static BackgroundLayerFactory* instance; + // LayerFactory overrides. + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp index 4c134a58bf..4dacb905df 100644 --- a/include/mbgl/style/layers/circle_layer.hpp +++ b/include/mbgl/style/layers/circle_layer.hpp @@ -107,15 +107,11 @@ protected: class CircleLayerFactory : public LayerFactory { public: CircleLayerFactory(); - // LayerFactory overrides. ~CircleLayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static CircleLayerFactory* get() noexcept; -private: - static CircleLayerFactory* instance; + // LayerFactory overrides. + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/include/mbgl/style/layers/custom_layer.hpp b/include/mbgl/style/layers/custom_layer.hpp index 0d13001b91..5021df6a60 100644 --- a/include/mbgl/style/layers/custom_layer.hpp +++ b/include/mbgl/style/layers/custom_layer.hpp @@ -90,13 +90,9 @@ public: CustomLayerFactory(); // LayerFactory overrides. ~CustomLayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static CustomLayerFactory* get() noexcept; -private: - static CustomLayerFactory* instance; + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp index 621eb45bc4..0092e61f3b 100644 --- a/include/mbgl/style/layers/fill_extrusion_layer.hpp +++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp @@ -83,15 +83,11 @@ protected: class FillExtrusionLayerFactory : public LayerFactory { public: FillExtrusionLayerFactory(); - // LayerFactory overrides. ~FillExtrusionLayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static FillExtrusionLayerFactory* get() noexcept; -private: - static FillExtrusionLayerFactory* instance; + // LayerFactory overrides. + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index aeb0ba988a..52bbd054ae 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -83,15 +83,11 @@ protected: class FillLayerFactory : public LayerFactory { public: FillLayerFactory(); - // LayerFactory overrides. ~FillLayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static FillLayerFactory* get() noexcept; -private: - static FillLayerFactory* instance; + // LayerFactory overrides. + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp index 3630dafba9..d1760100ad 100644 --- a/include/mbgl/style/layers/heatmap_layer.hpp +++ b/include/mbgl/style/layers/heatmap_layer.hpp @@ -72,15 +72,11 @@ protected: class HeatmapLayerFactory : public LayerFactory { public: HeatmapLayerFactory(); - // LayerFactory overrides. ~HeatmapLayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static HeatmapLayerFactory* get() noexcept; -private: - static HeatmapLayerFactory* instance; + // LayerFactory overrides. + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/include/mbgl/style/layers/hillshade_layer.hpp b/include/mbgl/style/layers/hillshade_layer.hpp index a251956d01..978670f8a9 100644 --- a/include/mbgl/style/layers/hillshade_layer.hpp +++ b/include/mbgl/style/layers/hillshade_layer.hpp @@ -77,15 +77,11 @@ protected: class HillshadeLayerFactory : public LayerFactory { public: HillshadeLayerFactory(); - // LayerFactory overrides. ~HillshadeLayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static HillshadeLayerFactory* get() noexcept; -private: - static HillshadeLayerFactory* instance; + // LayerFactory overrides. + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs index d335829efb..11d45b4b0c 100644 --- a/include/mbgl/style/layers/layer.hpp.ejs +++ b/include/mbgl/style/layers/layer.hpp.ejs @@ -75,15 +75,11 @@ protected: class <%- camelize(type) %>LayerFactory : public LayerFactory { public: <%- camelize(type) %>LayerFactory(); - // LayerFactory overrides. ~<%- camelize(type) %>LayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static <%- camelize(type) %>LayerFactory* get() noexcept; -private: - static <%- camelize(type) %>LayerFactory* instance; + // LayerFactory overrides. + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index 26837f4d06..0f5e2bb347 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -128,15 +128,11 @@ protected: class LineLayerFactory : public LayerFactory { public: LineLayerFactory(); - // LayerFactory overrides. ~LineLayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static LineLayerFactory* get() noexcept; -private: - static LineLayerFactory* instance; + // LayerFactory overrides. + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp index 86f57f3d12..4b63570590 100644 --- a/include/mbgl/style/layers/raster_layer.hpp +++ b/include/mbgl/style/layers/raster_layer.hpp @@ -89,15 +89,11 @@ protected: class RasterLayerFactory : public LayerFactory { public: RasterLayerFactory(); - // LayerFactory overrides. ~RasterLayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static RasterLayerFactory* get() noexcept; -private: - static RasterLayerFactory* instance; + // LayerFactory overrides. + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index 685e3cb4df..62ea393b33 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -277,15 +277,11 @@ protected: class SymbolLayerFactory : public LayerFactory { public: SymbolLayerFactory(); - // LayerFactory overrides. ~SymbolLayerFactory() override; - bool supportsType(const std::string& type) const noexcept final; - std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; - - static SymbolLayerFactory* get() noexcept; -private: - static SymbolLayerFactory* instance; + // LayerFactory overrides. + const LayerTypeInfo* getTypeInfo() const noexcept final; + std::unique_ptr createLayer(const std::string& id, const conversion::Convertible& value) final; }; } // namespace style diff --git a/platform/android/src/style/layers/background_layer.cpp b/platform/android/src/style/layers/background_layer.cpp index c0d3f39bc4..e28fd0798b 100644 --- a/platform/android/src/style/layers/background_layer.cpp +++ b/platform/android/src/style/layers/background_layer.cpp @@ -109,12 +109,12 @@ namespace android { } // namespace jni::Local> BackgroundJavaLayerPeerFactory::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 BackgroundLayer(map, toBackgroundLayer(layer))); } jni::Local> BackgroundJavaLayerPeerFactory::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 BackgroundLayer(map, std::unique_ptr(static_cast(layer.release())))); } diff --git a/platform/android/src/style/layers/circle_layer.cpp b/platform/android/src/style/layers/circle_layer.cpp index 13f3a4cb03..f460031dcd 100644 --- a/platform/android/src/style/layers/circle_layer.cpp +++ b/platform/android/src/style/layers/circle_layer.cpp @@ -214,12 +214,12 @@ namespace android { } // namespace jni::Local> CircleJavaLayerPeerFactory::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 CircleLayer(map, toCircleLayer(layer))); } jni::Local> CircleJavaLayerPeerFactory::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 CircleLayer(map, std::unique_ptr(static_cast(layer.release())))); } diff --git a/platform/android/src/style/layers/fill_extrusion_layer.cpp b/platform/android/src/style/layers/fill_extrusion_layer.cpp index fd67b391ac..7767a900d0 100644 --- a/platform/android/src/style/layers/fill_extrusion_layer.cpp +++ b/platform/android/src/style/layers/fill_extrusion_layer.cpp @@ -168,12 +168,12 @@ namespace android { } // namespace jni::Local> FillExtrusionJavaLayerPeerFactory::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 FillExtrusionLayer(map, toFillExtrusionLayer(layer))); } jni::Local> FillExtrusionJavaLayerPeerFactory::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 FillExtrusionLayer(map, std::unique_ptr(static_cast(layer.release())))); } 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())))); } diff --git a/platform/android/src/style/layers/heatmap_layer.cpp b/platform/android/src/style/layers/heatmap_layer.cpp index d478746f09..509ab5d707 100644 --- a/platform/android/src/style/layers/heatmap_layer.cpp +++ b/platform/android/src/style/layers/heatmap_layer.cpp @@ -123,12 +123,12 @@ namespace android { } // namespace jni::Local> HeatmapJavaLayerPeerFactory::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 HeatmapLayer(map, toHeatmapLayer(layer))); } jni::Local> HeatmapJavaLayerPeerFactory::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 HeatmapLayer(map, std::unique_ptr(static_cast(layer.release())))); } diff --git a/platform/android/src/style/layers/hillshade_layer.cpp b/platform/android/src/style/layers/hillshade_layer.cpp index 3c2ab33d43..bc25f666a0 100644 --- a/platform/android/src/style/layers/hillshade_layer.cpp +++ b/platform/android/src/style/layers/hillshade_layer.cpp @@ -137,12 +137,12 @@ namespace android { } // namespace jni::Local> HillshadeJavaLayerPeerFactory::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 HillshadeLayer(map, toHillshadeLayer(layer))); } jni::Local> HillshadeJavaLayerPeerFactory::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 HillshadeLayer(map, std::unique_ptr(static_cast(layer.release())))); } diff --git a/platform/android/src/style/layers/layer.cpp.ejs b/platform/android/src/style/layers/layer.cpp.ejs index 1489d83a5e..c81fc5ab39 100644 --- a/platform/android/src/style/layers/layer.cpp.ejs +++ b/platform/android/src/style/layers/layer.cpp.ejs @@ -101,12 +101,12 @@ namespace android { } // namespace jni::Local> <%- camelize(type) %>JavaLayerPeerFactory::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 <%- camelize(type) %>Layer(map, to<%- camelize(type) %>Layer(layer))); } jni::Local> <%- camelize(type) %>JavaLayerPeerFactory::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 <%- camelize(type) %>Layer(map, std::unique_ptrLayer>(static_castLayer*>(layer.release())))); } diff --git a/platform/android/src/style/layers/layer_manager.cpp b/platform/android/src/style/layers/layer_manager.cpp index 72bc317607..9ad62121e6 100644 --- a/platform/android/src/style/layers/layer_manager.cpp +++ b/platform/android/src/style/layers/layer_manager.cpp @@ -34,16 +34,16 @@ namespace mbgl { namespace android { LayerManagerAndroid::LayerManagerAndroid() { - factories.emplace_back(std::unique_ptr(new FillJavaLayerPeerFactory)); - factories.emplace_back(std::unique_ptr(new LineJavaLayerPeerFactory)); - factories.emplace_back(std::unique_ptr(new CircleJavaLayerPeerFactory)); - factories.emplace_back(std::unique_ptr(new SymbolJavaLayerPeerFactory)); - factories.emplace_back(std::unique_ptr(new RasterJavaLayerPeerFactory)); - factories.emplace_back(std::unique_ptr(new BackgroundJavaLayerPeerFactory)); - factories.emplace_back(std::unique_ptr(new HillshadeJavaLayerPeerFactory)); - factories.emplace_back(std::unique_ptr(new FillExtrusionJavaLayerPeerFactory)); - factories.emplace_back(std::unique_ptr(new HeatmapJavaLayerPeerFactory)); - factories.emplace_back(std::unique_ptr(new CustomJavaLayerPeerFactory)); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); } LayerManagerAndroid::~LayerManagerAndroid() = default; @@ -69,11 +69,20 @@ void LayerManagerAndroid::registerNative(jni::JNIEnv& env) { } } +void LayerManagerAndroid::addLayerType(std::unique_ptr factory) { + auto* coreFactory = factory->getLayerFactory(); + std::string type{coreFactory->getTypeInfo()->type}; + if (!type.empty()) { + typeToFactory.emplace(std::make_pair(std::move(type), coreFactory)); + } + factories.emplace_back(std::move(factory)); +} + JavaLayerPeerFactory* LayerManagerAndroid::getPeerFactory(mbgl::style::Layer* layer) { - auto* layerFactory = layer->baseImpl->getLayerFactory(); - assert(layerFactory); + auto* typeInfo = layer->baseImpl->getTypeInfo(); + assert(typeInfo); for (const auto& factory: factories) { - if (factory->getLayerFactory() == layerFactory) { + if (factory->getLayerFactory()->getTypeInfo() == typeInfo) { return factory.get(); } } @@ -81,16 +90,17 @@ JavaLayerPeerFactory* LayerManagerAndroid::getPeerFactory(mbgl::style::Layer* la return nullptr; } -std::unique_ptr LayerManagerAndroid::createLayer(const std::string& type, const std::string& id, const style::conversion::Convertible& value, style::conversion::Error& error) noexcept{ - for (const auto& factory: factories) { - auto* layerFactory = factory->getLayerFactory(); - if (layerFactory->supportsType(type)) { - if (auto layer = layerFactory->createLayer(id, value)) { - return layer; - } +std::unique_ptr LayerManagerAndroid::createLayer(const std::string& type, + const std::string& id, + const style::conversion::Convertible& value, + style::conversion::Error& error) noexcept { + auto search = typeToFactory.find(type); + if (search != typeToFactory.end()) { + auto layer = search->second->createLayer(id, value); + if (!layer) { error.message = "Error parsing a layer of type: " + type; - return nullptr; } + return layer; } error.message = "Unsupported layer type: " + type; return nullptr; diff --git a/platform/android/src/style/layers/layer_manager.hpp b/platform/android/src/style/layers/layer_manager.hpp index cec9d39d8c..396521cc4a 100644 --- a/platform/android/src/style/layers/layer_manager.hpp +++ b/platform/android/src/style/layers/layer_manager.hpp @@ -28,11 +28,13 @@ public: private: LayerManagerAndroid(); + void addLayerType(std::unique_ptr); JavaLayerPeerFactory* getPeerFactory(mbgl::style::Layer*); // mbgl:style::LayerManager overrides. std::unique_ptr createLayer(const std::string& type, const std::string& id, const style::conversion::Convertible& value, style::conversion::Error& error) noexcept final; std::vector> factories; + std::map typeToFactory; }; } diff --git a/platform/android/src/style/layers/line_layer.cpp b/platform/android/src/style/layers/line_layer.cpp index 69b745b89c..73fcd5f991 100644 --- a/platform/android/src/style/layers/line_layer.cpp +++ b/platform/android/src/style/layers/line_layer.cpp @@ -247,12 +247,12 @@ namespace android { } // namespace jni::Local> LineJavaLayerPeerFactory::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 LineLayer(map, toLineLayer(layer))); } jni::Local> LineJavaLayerPeerFactory::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 LineLayer(map, std::unique_ptr(static_cast(layer.release())))); } diff --git a/platform/android/src/style/layers/raster_layer.cpp b/platform/android/src/style/layers/raster_layer.cpp index 00286c0f16..b12267525f 100644 --- a/platform/android/src/style/layers/raster_layer.cpp +++ b/platform/android/src/style/layers/raster_layer.cpp @@ -173,12 +173,12 @@ namespace android { } // namespace jni::Local> RasterJavaLayerPeerFactory::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 RasterLayer(map, toRasterLayer(layer))); } jni::Local> RasterJavaLayerPeerFactory::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 RasterLayer(map, std::unique_ptr(static_cast(layer.release())))); } diff --git a/platform/android/src/style/layers/symbol_layer.cpp b/platform/android/src/style/layers/symbol_layer.cpp index 646e02ce32..61e4d59326 100644 --- a/platform/android/src/style/layers/symbol_layer.cpp +++ b/platform/android/src/style/layers/symbol_layer.cpp @@ -466,12 +466,12 @@ namespace android { } // namespace jni::Local> SymbolJavaLayerPeerFactory::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 SymbolLayer(map, toSymbolLayer(layer))); } jni::Local> SymbolJavaLayerPeerFactory::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 SymbolLayer(map, std::unique_ptr(static_cast(layer.release())))); } diff --git a/platform/default/layer_manager.cpp b/platform/default/layer_manager.cpp index 919bc9e64e..0a27c0b512 100644 --- a/platform/default/layer_manager.cpp +++ b/platform/default/layer_manager.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -10,6 +11,7 @@ #include #include +#include #include #include @@ -19,36 +21,48 @@ namespace style { class LayerManagerBase : public LayerManager { public: LayerManagerBase(); + private: + void addLayerType(std::unique_ptr); // LayerManager overrides. std::unique_ptr createLayer(const std::string& type, const std::string& id, const conversion::Convertible& value, conversion::Error& error) noexcept final; + std::vector> factories; + std::map typeToFactory; }; LayerManagerBase::LayerManagerBase() { - factories.emplace_back(std::unique_ptr(new FillLayerFactory)); - factories.emplace_back(std::unique_ptr(new LineLayerFactory)); - factories.emplace_back(std::unique_ptr(new CircleLayerFactory)); - factories.emplace_back(std::unique_ptr(new SymbolLayerFactory)); - factories.emplace_back(std::unique_ptr(new RasterLayerFactory)); - factories.emplace_back(std::unique_ptr(new BackgroundLayerFactory)); - factories.emplace_back(std::unique_ptr(new HillshadeLayerFactory)); - factories.emplace_back(std::unique_ptr(new FillExtrusionLayerFactory)); - factories.emplace_back(std::unique_ptr(new HeatmapLayerFactory)); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); + addLayerType(std::make_unique()); +} + +void LayerManagerBase::addLayerType(std::unique_ptr factory) { + std::string type{factory->getTypeInfo()->type}; + if (!type.empty()) { + typeToFactory.emplace(std::make_pair(std::move(type), factory.get())); + } + factories.emplace_back(std::move(factory)); } std::unique_ptr LayerManagerBase::createLayer(const std::string& type, const std::string& id, const conversion::Convertible& value, conversion::Error& error) noexcept { - for (const auto& factory: factories) { - if (factory->supportsType(type)) { - auto layer = factory->createLayer(id, value); - if (!layer) { - error.message = "Error parsing a layer of type: " + type; - } - return layer; + auto search = typeToFactory.find(type); + if (search != typeToFactory.end()) { + auto layer = search->second->createLayer(id, value); + if (!layer) { + error.message = "Error parsing a layer of type: " + type; } + return layer; } error.message = "Unsupported layer type: " + type; return nullptr; diff --git a/src/mbgl/style/layer.cpp b/src/mbgl/style/layer.cpp index 2225fa921b..56b825760b 100644 --- a/src/mbgl/style/layer.cpp +++ b/src/mbgl/style/layer.cpp @@ -107,6 +107,10 @@ optional Layer::setVisibility(const conversion::Convertible& return nullopt; } +const LayerTypeInfo* Layer::getTypeInfo() const noexcept { + return baseImpl->getTypeInfo(); +} + optional LayerFactory::getSource(const conversion::Convertible& value) const noexcept { auto sourceValue = objectMember(value, "source"); if (!sourceValue) { diff --git a/src/mbgl/style/layer_impl.hpp b/src/mbgl/style/layer_impl.hpp index 74d1f2b211..014fb60348 100644 --- a/src/mbgl/style/layer_impl.hpp +++ b/src/mbgl/style/layer_impl.hpp @@ -41,8 +41,9 @@ public: // Utility function for automatic layer grouping. virtual void stringifyLayout(rapidjson::Writer&) const = 0; - virtual LayerFactory* getLayerFactory() const noexcept = 0; + virtual const LayerTypeInfo* getTypeInfo() const noexcept = 0; + // Note: LayerType is deprecated, do not use it. const LayerType type; std::string id; std::string source; diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp index d84c7b66de..43ada28ab7 100644 --- a/src/mbgl/style/layers/background_layer.cpp +++ b/src/mbgl/style/layers/background_layer.cpp @@ -14,6 +14,10 @@ namespace mbgl { namespace style { +namespace { + const LayerTypeInfo typeInfoBackground{ "background", LayerTypeInfo::SourceNotRequired }; +} // namespace + BackgroundLayer::BackgroundLayer(const std::string& layerID) : Layer(makeMutable(LayerType::Background, layerID, std::string())) { } @@ -42,8 +46,8 @@ std::unique_ptr BackgroundLayer::cloneRef(const std::string& id_) const { void BackgroundLayer::Impl::stringifyLayout(rapidjson::Writer&) const { } -LayerFactory* BackgroundLayer::Impl::getLayerFactory() const noexcept { - return BackgroundLayerFactory::get(); +const LayerTypeInfo* BackgroundLayer::Impl::getTypeInfo() const noexcept { + return &typeInfoBackground; } // Layout properties @@ -274,23 +278,12 @@ Mutable BackgroundLayer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -BackgroundLayerFactory* BackgroundLayerFactory::instance = nullptr; - -BackgroundLayerFactory::BackgroundLayerFactory() { - assert(!instance); - instance = this; -} +BackgroundLayerFactory::BackgroundLayerFactory() = default; BackgroundLayerFactory::~BackgroundLayerFactory() = default; -// static -BackgroundLayerFactory* BackgroundLayerFactory::get() noexcept { - assert(instance); - return instance; -} - -bool BackgroundLayerFactory::supportsType(const std::string& type) const noexcept { - return type == "background"; +const LayerTypeInfo* BackgroundLayerFactory::getTypeInfo() const noexcept { + return &typeInfoBackground; } std::unique_ptr BackgroundLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { diff --git a/src/mbgl/style/layers/background_layer_impl.hpp b/src/mbgl/style/layers/background_layer_impl.hpp index da81233824..5407c4c065 100644 --- a/src/mbgl/style/layers/background_layer_impl.hpp +++ b/src/mbgl/style/layers/background_layer_impl.hpp @@ -13,7 +13,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - LayerFactory* getLayerFactory() const noexcept final; + const LayerTypeInfo* getTypeInfo() const noexcept final; BackgroundPaintProperties::Transitionable paint; }; diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp index c1f084f03a..76942d808a 100644 --- a/src/mbgl/style/layers/circle_layer.cpp +++ b/src/mbgl/style/layers/circle_layer.cpp @@ -14,6 +14,10 @@ namespace mbgl { namespace style { +namespace { + const LayerTypeInfo typeInfoCircle{ "circle", LayerTypeInfo::SourceRequired }; +} // namespace + CircleLayer::CircleLayer(const std::string& layerID, const std::string& sourceID) : Layer(makeMutable(LayerType::Circle, layerID, sourceID)) { } @@ -42,8 +46,8 @@ std::unique_ptr CircleLayer::cloneRef(const std::string& id_) const { void CircleLayer::Impl::stringifyLayout(rapidjson::Writer&) const { } -LayerFactory* CircleLayer::Impl::getLayerFactory() const noexcept { - return CircleLayerFactory::get(); +const LayerTypeInfo* CircleLayer::Impl::getTypeInfo() const noexcept { + return &typeInfoCircle; } // Layout properties @@ -691,23 +695,12 @@ Mutable CircleLayer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -CircleLayerFactory* CircleLayerFactory::instance = nullptr; - -CircleLayerFactory::CircleLayerFactory() { - assert(!instance); - instance = this; -} +CircleLayerFactory::CircleLayerFactory() = default; CircleLayerFactory::~CircleLayerFactory() = default; -// static -CircleLayerFactory* CircleLayerFactory::get() noexcept { - assert(instance); - return instance; -} - -bool CircleLayerFactory::supportsType(const std::string& type) const noexcept { - return type == "circle"; +const LayerTypeInfo* CircleLayerFactory::getTypeInfo() const noexcept { + return &typeInfoCircle; } std::unique_ptr CircleLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { diff --git a/src/mbgl/style/layers/circle_layer_impl.hpp b/src/mbgl/style/layers/circle_layer_impl.hpp index a6eca13c79..5cd56b630c 100644 --- a/src/mbgl/style/layers/circle_layer_impl.hpp +++ b/src/mbgl/style/layers/circle_layer_impl.hpp @@ -13,7 +13,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - LayerFactory* getLayerFactory() const noexcept final; + const LayerTypeInfo* getTypeInfo() const noexcept final; CirclePaintProperties::Transitionable paint; }; diff --git a/src/mbgl/style/layers/custom_layer.cpp b/src/mbgl/style/layers/custom_layer.cpp index 012771ec94..42d8349c41 100644 --- a/src/mbgl/style/layers/custom_layer.cpp +++ b/src/mbgl/style/layers/custom_layer.cpp @@ -5,6 +5,10 @@ namespace mbgl { namespace style { +namespace { + const LayerTypeInfo typeInfoCustom{ "", LayerTypeInfo::SourceNotRequired }; +} // namespace + CustomLayer::CustomLayer(const std::string& layerID, std::unique_ptr host) : Layer(makeMutable(layerID, std::move(host))) { @@ -39,23 +43,16 @@ Mutable CustomLayer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -CustomLayerFactory* CustomLayerFactory::instance = nullptr; - -CustomLayerFactory::CustomLayerFactory() { - assert(!instance); - instance = this; +const LayerTypeInfo* CustomLayer::Impl::getTypeInfo() const noexcept { + return &typeInfoCustom; } -CustomLayerFactory::~CustomLayerFactory() = default; +CustomLayerFactory::CustomLayerFactory() = default; -// static -CustomLayerFactory* CustomLayerFactory::get() noexcept { - assert(instance); - return instance; -} +CustomLayerFactory::~CustomLayerFactory() = default; -bool CustomLayerFactory::supportsType(const std::string&) const noexcept { - return false; +const LayerTypeInfo* CustomLayerFactory::getTypeInfo() const noexcept { + return &typeInfoCustom; } std::unique_ptr CustomLayerFactory::createLayer(const std::string&, const conversion::Convertible&) { diff --git a/src/mbgl/style/layers/custom_layer_impl.cpp b/src/mbgl/style/layers/custom_layer_impl.cpp index 81d0fd344a..05c41623c4 100644 --- a/src/mbgl/style/layers/custom_layer_impl.cpp +++ b/src/mbgl/style/layers/custom_layer_impl.cpp @@ -16,9 +16,5 @@ bool CustomLayer::Impl::hasLayoutDifference(const Layer::Impl&) const { void CustomLayer::Impl::stringifyLayout(rapidjson::Writer&) const { } -LayerFactory* CustomLayer::Impl::getLayerFactory() const noexcept { - return CustomLayerFactory::get(); -} - } // namespace style } // namespace mbgl diff --git a/src/mbgl/style/layers/custom_layer_impl.hpp b/src/mbgl/style/layers/custom_layer_impl.hpp index c9faba11c6..6c7a9078a5 100644 --- a/src/mbgl/style/layers/custom_layer_impl.hpp +++ b/src/mbgl/style/layers/custom_layer_impl.hpp @@ -18,7 +18,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - LayerFactory* getLayerFactory() const noexcept final; + const LayerTypeInfo* getTypeInfo() const noexcept final; std::shared_ptr host; }; diff --git a/src/mbgl/style/layers/fill_extrusion_layer.cpp b/src/mbgl/style/layers/fill_extrusion_layer.cpp index c230e7f7f9..5357197641 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer.cpp +++ b/src/mbgl/style/layers/fill_extrusion_layer.cpp @@ -14,6 +14,10 @@ namespace mbgl { namespace style { +namespace { + const LayerTypeInfo typeInfoFillExtrusion{ "fill-extrusion", LayerTypeInfo::SourceRequired }; +} // namespace + FillExtrusionLayer::FillExtrusionLayer(const std::string& layerID, const std::string& sourceID) : Layer(makeMutable(LayerType::FillExtrusion, layerID, sourceID)) { } @@ -42,8 +46,8 @@ std::unique_ptr FillExtrusionLayer::cloneRef(const std::string& id_) cons void FillExtrusionLayer::Impl::stringifyLayout(rapidjson::Writer&) const { } -LayerFactory* FillExtrusionLayer::Impl::getLayerFactory() const noexcept { - return FillExtrusionLayerFactory::get(); +const LayerTypeInfo* FillExtrusionLayer::Impl::getTypeInfo() const noexcept { + return &typeInfoFillExtrusion; } // Layout properties @@ -493,23 +497,12 @@ Mutable FillExtrusionLayer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -FillExtrusionLayerFactory* FillExtrusionLayerFactory::instance = nullptr; - -FillExtrusionLayerFactory::FillExtrusionLayerFactory() { - assert(!instance); - instance = this; -} +FillExtrusionLayerFactory::FillExtrusionLayerFactory() = default; FillExtrusionLayerFactory::~FillExtrusionLayerFactory() = default; -// static -FillExtrusionLayerFactory* FillExtrusionLayerFactory::get() noexcept { - assert(instance); - return instance; -} - -bool FillExtrusionLayerFactory::supportsType(const std::string& type) const noexcept { - return type == "fill-extrusion"; +const LayerTypeInfo* FillExtrusionLayerFactory::getTypeInfo() const noexcept { + return &typeInfoFillExtrusion; } std::unique_ptr FillExtrusionLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { diff --git a/src/mbgl/style/layers/fill_extrusion_layer_impl.hpp b/src/mbgl/style/layers/fill_extrusion_layer_impl.hpp index 9dad845edc..6758320c2b 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer_impl.hpp +++ b/src/mbgl/style/layers/fill_extrusion_layer_impl.hpp @@ -13,7 +13,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - LayerFactory* getLayerFactory() const noexcept final; + const LayerTypeInfo* getTypeInfo() const noexcept final; Properties<>::Unevaluated layout; FillExtrusionPaintProperties::Transitionable paint; diff --git a/src/mbgl/style/layers/fill_layer.cpp b/src/mbgl/style/layers/fill_layer.cpp index 2b81fd6fa4..621428fc7c 100644 --- a/src/mbgl/style/layers/fill_layer.cpp +++ b/src/mbgl/style/layers/fill_layer.cpp @@ -14,6 +14,10 @@ namespace mbgl { namespace style { +namespace { + const LayerTypeInfo typeInfoFill{ "fill", LayerTypeInfo::SourceRequired }; +} // namespace + FillLayer::FillLayer(const std::string& layerID, const std::string& sourceID) : Layer(makeMutable(LayerType::Fill, layerID, sourceID)) { } @@ -42,8 +46,8 @@ std::unique_ptr FillLayer::cloneRef(const std::string& id_) const { void FillLayer::Impl::stringifyLayout(rapidjson::Writer&) const { } -LayerFactory* FillLayer::Impl::getLayerFactory() const noexcept { - return FillLayerFactory::get(); +const LayerTypeInfo* FillLayer::Impl::getTypeInfo() const noexcept { + return &typeInfoFill; } // Layout properties @@ -493,23 +497,12 @@ Mutable FillLayer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -FillLayerFactory* FillLayerFactory::instance = nullptr; - -FillLayerFactory::FillLayerFactory() { - assert(!instance); - instance = this; -} +FillLayerFactory::FillLayerFactory() = default; FillLayerFactory::~FillLayerFactory() = default; -// static -FillLayerFactory* FillLayerFactory::get() noexcept { - assert(instance); - return instance; -} - -bool FillLayerFactory::supportsType(const std::string& type) const noexcept { - return type == "fill"; +const LayerTypeInfo* FillLayerFactory::getTypeInfo() const noexcept { + return &typeInfoFill; } std::unique_ptr FillLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { diff --git a/src/mbgl/style/layers/fill_layer_impl.hpp b/src/mbgl/style/layers/fill_layer_impl.hpp index ae7a1a5a3e..5b0592d062 100644 --- a/src/mbgl/style/layers/fill_layer_impl.hpp +++ b/src/mbgl/style/layers/fill_layer_impl.hpp @@ -13,7 +13,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - LayerFactory* getLayerFactory() const noexcept final; + const LayerTypeInfo* getTypeInfo() const noexcept final; Properties<>::Unevaluated layout; FillPaintProperties::Transitionable paint; diff --git a/src/mbgl/style/layers/heatmap_layer.cpp b/src/mbgl/style/layers/heatmap_layer.cpp index eb6033d727..3d848ec128 100644 --- a/src/mbgl/style/layers/heatmap_layer.cpp +++ b/src/mbgl/style/layers/heatmap_layer.cpp @@ -14,6 +14,10 @@ namespace mbgl { namespace style { +namespace { + const LayerTypeInfo typeInfoHeatmap{ "heatmap", LayerTypeInfo::SourceRequired }; +} // namespace + HeatmapLayer::HeatmapLayer(const std::string& layerID, const std::string& sourceID) : Layer(makeMutable(LayerType::Heatmap, layerID, sourceID)) { } @@ -42,8 +46,8 @@ std::unique_ptr HeatmapLayer::cloneRef(const std::string& id_) const { void HeatmapLayer::Impl::stringifyLayout(rapidjson::Writer&) const { } -LayerFactory* HeatmapLayer::Impl::getLayerFactory() const noexcept { - return HeatmapLayerFactory::get(); +const LayerTypeInfo* HeatmapLayer::Impl::getTypeInfo() const noexcept { + return &typeInfoHeatmap; } // Layout properties @@ -378,23 +382,12 @@ Mutable HeatmapLayer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -HeatmapLayerFactory* HeatmapLayerFactory::instance = nullptr; - -HeatmapLayerFactory::HeatmapLayerFactory() { - assert(!instance); - instance = this; -} +HeatmapLayerFactory::HeatmapLayerFactory() = default; HeatmapLayerFactory::~HeatmapLayerFactory() = default; -// static -HeatmapLayerFactory* HeatmapLayerFactory::get() noexcept { - assert(instance); - return instance; -} - -bool HeatmapLayerFactory::supportsType(const std::string& type) const noexcept { - return type == "heatmap"; +const LayerTypeInfo* HeatmapLayerFactory::getTypeInfo() const noexcept { + return &typeInfoHeatmap; } std::unique_ptr HeatmapLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { diff --git a/src/mbgl/style/layers/heatmap_layer_impl.hpp b/src/mbgl/style/layers/heatmap_layer_impl.hpp index 10c0e4aa46..7645fa0cc1 100644 --- a/src/mbgl/style/layers/heatmap_layer_impl.hpp +++ b/src/mbgl/style/layers/heatmap_layer_impl.hpp @@ -13,7 +13,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - LayerFactory* getLayerFactory() const noexcept final; + const LayerTypeInfo* getTypeInfo() const noexcept final; HeatmapPaintProperties::Transitionable paint; }; diff --git a/src/mbgl/style/layers/hillshade_layer.cpp b/src/mbgl/style/layers/hillshade_layer.cpp index 27c7c7b6d7..6a7e3dc1a7 100644 --- a/src/mbgl/style/layers/hillshade_layer.cpp +++ b/src/mbgl/style/layers/hillshade_layer.cpp @@ -14,6 +14,10 @@ namespace mbgl { namespace style { +namespace { + const LayerTypeInfo typeInfoHillshade{ "hillshade", LayerTypeInfo::SourceRequired }; +} // namespace + HillshadeLayer::HillshadeLayer(const std::string& layerID, const std::string& sourceID) : Layer(makeMutable(LayerType::Hillshade, layerID, sourceID)) { } @@ -42,8 +46,8 @@ std::unique_ptr HillshadeLayer::cloneRef(const std::string& id_) const { void HillshadeLayer::Impl::stringifyLayout(rapidjson::Writer&) const { } -LayerFactory* HillshadeLayer::Impl::getLayerFactory() const noexcept { - return HillshadeLayerFactory::get(); +const LayerTypeInfo* HillshadeLayer::Impl::getTypeInfo() const noexcept { + return &typeInfoHillshade; } // Layout properties @@ -425,23 +429,12 @@ Mutable HillshadeLayer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -HillshadeLayerFactory* HillshadeLayerFactory::instance = nullptr; - -HillshadeLayerFactory::HillshadeLayerFactory() { - assert(!instance); - instance = this; -} +HillshadeLayerFactory::HillshadeLayerFactory() = default; HillshadeLayerFactory::~HillshadeLayerFactory() = default; -// static -HillshadeLayerFactory* HillshadeLayerFactory::get() noexcept { - assert(instance); - return instance; -} - -bool HillshadeLayerFactory::supportsType(const std::string& type) const noexcept { - return type == "hillshade"; +const LayerTypeInfo* HillshadeLayerFactory::getTypeInfo() const noexcept { + return &typeInfoHillshade; } std::unique_ptr HillshadeLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { diff --git a/src/mbgl/style/layers/hillshade_layer_impl.hpp b/src/mbgl/style/layers/hillshade_layer_impl.hpp index 84b4aebf85..520b18cc84 100644 --- a/src/mbgl/style/layers/hillshade_layer_impl.hpp +++ b/src/mbgl/style/layers/hillshade_layer_impl.hpp @@ -13,7 +13,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - LayerFactory* getLayerFactory() const noexcept final; + const LayerTypeInfo* getTypeInfo() const noexcept final; HillshadePaintProperties::Transitionable paint; }; diff --git a/src/mbgl/style/layers/layer.cpp.ejs b/src/mbgl/style/layers/layer.cpp.ejs index 716f4ab854..4a708041e9 100644 --- a/src/mbgl/style/layers/layer.cpp.ejs +++ b/src/mbgl/style/layers/layer.cpp.ejs @@ -19,6 +19,14 @@ namespace mbgl { namespace style { +namespace { +<% if (type === 'background') { -%> + const LayerTypeInfo typeInfo<%- camelize(type) %>{ "<%- type %>", LayerTypeInfo::SourceNotRequired }; +<% } else { -%> + const LayerTypeInfo typeInfo<%- camelize(type) %>{ "<%- type %>", LayerTypeInfo::SourceRequired }; +<% } -%> +} // namespace + <% if (type === 'background') { -%> <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(const std::string& layerID) : Layer(makeMutable(LayerType::<%- camelize(type) %>, layerID, std::string())) { @@ -59,8 +67,8 @@ void <%- camelize(type) %>Layer::Impl::stringifyLayout(rapidjson::Writer -LayerFactory* <%- camelize(type) %>Layer::Impl::getLayerFactory() const noexcept { - return <%- camelize(type) %>LayerFactory::get(); +const LayerTypeInfo* <%- camelize(type) %>Layer::Impl::getTypeInfo() const noexcept { + return &typeInfo<%- camelize(type) %>; } // Layout properties @@ -264,23 +272,12 @@ Mutable <%- camelize(type) %>Layer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -<%- camelize(type) %>LayerFactory* <%- camelize(type) %>LayerFactory::instance = nullptr; - -<%- camelize(type) %>LayerFactory::<%- camelize(type) %>LayerFactory() { - assert(!instance); - instance = this; -} +<%- camelize(type) %>LayerFactory::<%- camelize(type) %>LayerFactory() = default; <%- camelize(type) %>LayerFactory::~<%- camelize(type) %>LayerFactory() = default; -// static -<%- camelize(type) %>LayerFactory* <%- camelize(type) %>LayerFactory::get() noexcept { - assert(instance); - return instance; -} - -bool <%- camelize(type) %>LayerFactory::supportsType(const std::string& type) const noexcept { - return type == "<%- type %>"; +const LayerTypeInfo* <%- camelize(type) %>LayerFactory::getTypeInfo() const noexcept { + return &typeInfo<%- camelize(type) %>; } std::unique_ptr <%- camelize(type) %>LayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp index 9d0504e0b1..e2875fc455 100644 --- a/src/mbgl/style/layers/line_layer.cpp +++ b/src/mbgl/style/layers/line_layer.cpp @@ -14,6 +14,10 @@ namespace mbgl { namespace style { +namespace { + const LayerTypeInfo typeInfoLine{ "line", LayerTypeInfo::SourceRequired }; +} // namespace + LineLayer::LineLayer(const std::string& layerID, const std::string& sourceID) : Layer(makeMutable(LayerType::Line, layerID, sourceID)) { } @@ -43,8 +47,8 @@ void LineLayer::Impl::stringifyLayout(rapidjson::Writer layout.stringify(writer); } -LayerFactory* LineLayer::Impl::getLayerFactory() const noexcept { - return LineLayerFactory::get(); +const LayerTypeInfo* LineLayer::Impl::getTypeInfo() const noexcept { + return &typeInfoLine; } // Layout properties @@ -832,23 +836,12 @@ Mutable LineLayer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -LineLayerFactory* LineLayerFactory::instance = nullptr; - -LineLayerFactory::LineLayerFactory() { - assert(!instance); - instance = this; -} +LineLayerFactory::LineLayerFactory() = default; LineLayerFactory::~LineLayerFactory() = default; -// static -LineLayerFactory* LineLayerFactory::get() noexcept { - assert(instance); - return instance; -} - -bool LineLayerFactory::supportsType(const std::string& type) const noexcept { - return type == "line"; +const LayerTypeInfo* LineLayerFactory::getTypeInfo() const noexcept { + return &typeInfoLine; } std::unique_ptr LineLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { diff --git a/src/mbgl/style/layers/line_layer_impl.hpp b/src/mbgl/style/layers/line_layer_impl.hpp index 0283c38885..cd56a18fa8 100644 --- a/src/mbgl/style/layers/line_layer_impl.hpp +++ b/src/mbgl/style/layers/line_layer_impl.hpp @@ -13,7 +13,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - LayerFactory* getLayerFactory() const noexcept final; + const LayerTypeInfo* getTypeInfo() const noexcept final; LineLayoutProperties::Unevaluated layout; LinePaintProperties::Transitionable paint; diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp index d9ac1add42..8e7c768680 100644 --- a/src/mbgl/style/layers/raster_layer.cpp +++ b/src/mbgl/style/layers/raster_layer.cpp @@ -14,6 +14,10 @@ namespace mbgl { namespace style { +namespace { + const LayerTypeInfo typeInfoRaster{ "raster", LayerTypeInfo::SourceRequired }; +} // namespace + RasterLayer::RasterLayer(const std::string& layerID, const std::string& sourceID) : Layer(makeMutable(LayerType::Raster, layerID, sourceID)) { } @@ -42,8 +46,8 @@ std::unique_ptr RasterLayer::cloneRef(const std::string& id_) const { void RasterLayer::Impl::stringifyLayout(rapidjson::Writer&) const { } -LayerFactory* RasterLayer::Impl::getLayerFactory() const noexcept { - return RasterLayerFactory::get(); +const LayerTypeInfo* RasterLayer::Impl::getTypeInfo() const noexcept { + return &typeInfoRaster; } // Layout properties @@ -514,23 +518,12 @@ Mutable RasterLayer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -RasterLayerFactory* RasterLayerFactory::instance = nullptr; - -RasterLayerFactory::RasterLayerFactory() { - assert(!instance); - instance = this; -} +RasterLayerFactory::RasterLayerFactory() = default; RasterLayerFactory::~RasterLayerFactory() = default; -// static -RasterLayerFactory* RasterLayerFactory::get() noexcept { - assert(instance); - return instance; -} - -bool RasterLayerFactory::supportsType(const std::string& type) const noexcept { - return type == "raster"; +const LayerTypeInfo* RasterLayerFactory::getTypeInfo() const noexcept { + return &typeInfoRaster; } std::unique_ptr RasterLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { diff --git a/src/mbgl/style/layers/raster_layer_impl.hpp b/src/mbgl/style/layers/raster_layer_impl.hpp index 450daf11bf..2e93ecec80 100644 --- a/src/mbgl/style/layers/raster_layer_impl.hpp +++ b/src/mbgl/style/layers/raster_layer_impl.hpp @@ -13,7 +13,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - LayerFactory* getLayerFactory() const noexcept final; + const LayerTypeInfo* getTypeInfo() const noexcept final; RasterPaintProperties::Transitionable paint; }; diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp index 5380194534..0c37396637 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -14,6 +14,10 @@ namespace mbgl { namespace style { +namespace { + const LayerTypeInfo typeInfoSymbol{ "symbol", LayerTypeInfo::SourceRequired }; +} // namespace + SymbolLayer::SymbolLayer(const std::string& layerID, const std::string& sourceID) : Layer(makeMutable(LayerType::Symbol, layerID, sourceID)) { } @@ -43,8 +47,8 @@ void SymbolLayer::Impl::stringifyLayout(rapidjson::Writer SymbolLayer::mutableBaseImpl() const { return staticMutableCast(mutableImpl()); } -SymbolLayerFactory* SymbolLayerFactory::instance = nullptr; - -SymbolLayerFactory::SymbolLayerFactory() { - assert(!instance); - instance = this; -} +SymbolLayerFactory::SymbolLayerFactory() = default; SymbolLayerFactory::~SymbolLayerFactory() = default; -// static -SymbolLayerFactory* SymbolLayerFactory::get() noexcept { - assert(instance); - return instance; -} - -bool SymbolLayerFactory::supportsType(const std::string& type) const noexcept { - return type == "symbol"; +const LayerTypeInfo* SymbolLayerFactory::getTypeInfo() const noexcept { + return &typeInfoSymbol; } std::unique_ptr SymbolLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { diff --git a/src/mbgl/style/layers/symbol_layer_impl.hpp b/src/mbgl/style/layers/symbol_layer_impl.hpp index b735e7ce8d..21e47ad89a 100644 --- a/src/mbgl/style/layers/symbol_layer_impl.hpp +++ b/src/mbgl/style/layers/symbol_layer_impl.hpp @@ -13,7 +13,7 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - LayerFactory* getLayerFactory() const noexcept final; + const LayerTypeInfo* getTypeInfo() const noexcept final; SymbolLayoutProperties::Unevaluated layout; SymbolPaintProperties::Transitionable paint; -- cgit v1.2.1