diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-15 15:47:25 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-15 17:48:36 +0200 |
commit | ff09c94d0825f5dbe7dddce52b64e74d61978976 (patch) | |
tree | 86833d95d8bf7abbcb8e6965aaba65d666ffff52 /src/mbgl/style/layers/hillshade_layer.cpp | |
parent | 73dcfe2d0d3475ad9584969c7908ba681a3f5bfa (diff) | |
download | qtlocation-mapboxgl-ff09c94d0825f5dbe7dddce52b64e74d61978976.tar.gz |
[core][android] Introduce mbgl::style::LayerTypeInfoupstream/mikhail_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.
Diffstat (limited to 'src/mbgl/style/layers/hillshade_layer.cpp')
-rw-r--r-- | src/mbgl/style/layers/hillshade_layer.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
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<Impl>(LayerType::Hillshade, layerID, sourceID)) { } @@ -42,8 +46,8 @@ std::unique_ptr<Layer> HillshadeLayer::cloneRef(const std::string& id_) const { void HillshadeLayer::Impl::stringifyLayout(rapidjson::Writer<rapidjson::StringBuffer>&) 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<Layer::Impl> HillshadeLayer::mutableBaseImpl() const { return staticMutableCast<Layer::Impl>(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<style::Layer> HillshadeLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) { |