[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.
This commit is contained in:
Mikhail Pozdnyakov
2018-11-15 15:47:25 +02:00
parent 73dcfe2d0d
commit 33818233cf
49 changed files with 256 additions and 323 deletions

View File

@@ -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<Impl>(LayerType::Circle, layerID, sourceID)) {
}
@@ -42,8 +46,8 @@ std::unique_ptr<Layer> CircleLayer::cloneRef(const std::string& id_) const {
void CircleLayer::Impl::stringifyLayout(rapidjson::Writer<rapidjson::StringBuffer>&) 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<Layer::Impl> CircleLayer::mutableBaseImpl() const {
return staticMutableCast<Layer::Impl>(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<style::Layer> CircleLayerFactory::createLayer(const std::string& id, const conversion::Convertible& value) {