diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-30 12:10:33 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-30 19:09:17 +0200 |
commit | 92352de87d4068985fa56100f2c6e16bf26a1c86 (patch) | |
tree | e3dd5729e2ef8e32931b8e42ab34a3d0b806ee18 /src/mbgl/style | |
parent | 8bc362e3a2836cfa96ef14a41a0e882a1d08e881 (diff) | |
download | qtlocation-mapboxgl-92352de87d4068985fa56100f2c6e16bf26a1c86.tar.gz |
[core] layermanager folder
Move `LayerManager` and `LayerFactory` abstract classes to a dedicated folder.
Diffstat (limited to 'src/mbgl/style')
-rw-r--r-- | src/mbgl/style/conversion/layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layer.cpp | 59 |
2 files changed, 2 insertions, 59 deletions
diff --git a/src/mbgl/style/conversion/layer.cpp b/src/mbgl/style/conversion/layer.cpp index b551f1bfb2..e8f94a1064 100644 --- a/src/mbgl/style/conversion/layer.cpp +++ b/src/mbgl/style/conversion/layer.cpp @@ -3,6 +3,8 @@ #include <mbgl/style/conversion/filter.hpp> #include <mbgl/style/conversion_impl.hpp> +#include <mbgl/layermanager/layer_manager.hpp> + namespace mbgl { namespace style { namespace conversion { diff --git a/src/mbgl/style/layer.cpp b/src/mbgl/style/layer.cpp index abe6444701..328cd47555 100644 --- a/src/mbgl/style/layer.cpp +++ b/src/mbgl/style/layer.cpp @@ -110,63 +110,4 @@ const LayerTypeInfo* Layer::getTypeInfo() const noexcept { } } // namespace style - -optional<std::string> LayerFactory::getSource(const style::conversion::Convertible& value) const noexcept { - auto sourceValue = objectMember(value, "source"); - if (!sourceValue) { - return nullopt; - } - - optional<std::string> source = toString(*sourceValue); - if (!source) { - return nullopt; - } - - return source; -} - -bool LayerFactory::initSourceLayerAndFilter(style::Layer* layer, const style::conversion::Convertible& value) const noexcept { - auto sourceLayerValue = objectMember(value, "source-layer"); - if (sourceLayerValue) { - optional<std::string> sourceLayer = toString(*sourceLayerValue); - if (!sourceLayer) { - return false; - } - layer->setSourceLayer(*sourceLayer); - } - - auto filterValue = objectMember(value, "filter"); - if (filterValue) { - style::conversion::Error error; - optional<style::Filter> filter = style::conversion::convert<style::Filter>(*filterValue, error); - if (!filter) { - return false; - } - layer->setFilter(*filter); - } - - return true; -} - -std::unique_ptr<style::Layer> LayerManager::createLayer( - const std::string& type, const std::string& id, - const style::conversion::Convertible& value, style::conversion::Error& error) noexcept { - if (LayerFactory* factory = getFactory(type)) { - auto layer = factory->createLayer(id, value); - if (!layer) { - error.message = "Error parsing a layer of type: " + type; - } - return layer; - } - error.message = "Unsupported layer type: " + type; - return nullptr; -} - -std::unique_ptr<RenderLayer> LayerManager::createRenderLayer(Immutable<style::Layer::Impl> impl) noexcept { - LayerFactory* factory = getFactory(impl->getTypeInfo()); - assert(factory); - return factory->createRenderLayer(std::move(impl)); -} - - } // namespace mbgl |