da4eb01bc7
- Generate style code for 'line-sort-key' and 'symbol-sort-key' - Add new layout properties to FillLayer::Impl, FillBucket, and FillLayerFactory - Fix consistency of paint and layout properties type alias usage in FillBucket, LineBucket - Add optional feature sorting to fill and line Layout creation - Enable node render tests for fill-sort-key and line-sort-key - Fix FillBucket test construction - Prefer emplace_back to push_back for PatternFeature container - Fix buggy static_cast for PatternFeature indices - Maintain sort of features as they are created - Switch pattern layout features container to list from vector for better insert performance - Fix formatting expected by sanity check - Use subclass PatternLayoutSorted to work around lack of template functions - Fix to retain source order for features with equivalent sort keys during sorting - [core] Fix clang-format - [core] Address review comments - [core] Pass inserting strategy class at compile time - [core] Use sorted strategy only if sort key is defined in layout - [core] Update style generator - [core] Merge PatternLayout and PatternLayoutSorted classes - Use static methods for inserter strategies - Merge PatternLayout and PatternLayoutSorted classes
47 lines
2.1 KiB
C++
47 lines
2.1 KiB
C++
#include <mbgl/layermanager/line_layer_factory.hpp>
|
|
|
|
#include <mbgl/renderer/buckets/line_bucket.hpp>
|
|
#include <mbgl/renderer/layers/render_line_layer.hpp>
|
|
#include <mbgl/style/layers/line_layer.hpp>
|
|
#include <mbgl/style/layers/line_layer_impl.hpp>
|
|
|
|
namespace mbgl {
|
|
|
|
const style::LayerTypeInfo* LineLayerFactory::getTypeInfo() const noexcept {
|
|
return style::LineLayer::Impl::staticTypeInfo();
|
|
}
|
|
|
|
std::unique_ptr<style::Layer> LineLayerFactory::createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept {
|
|
optional<std::string> source = getSource(value);
|
|
if (!source) {
|
|
return nullptr;
|
|
}
|
|
|
|
std::unique_ptr<style::Layer> layer = std::unique_ptr<style::Layer>(new style::LineLayer(id, *source));
|
|
if (!initSourceLayerAndFilter(layer.get(), value)) {
|
|
return nullptr;
|
|
}
|
|
return layer;
|
|
}
|
|
|
|
std::unique_ptr<Layout> LineLayerFactory::createLayout(const LayoutParameters& parameters,
|
|
std::unique_ptr<GeometryTileLayer> layer,
|
|
const std::vector<Immutable<style::LayerProperties>>& group) noexcept {
|
|
using namespace style;
|
|
using LayoutTypeUnsorted = PatternLayout<LineBucket, LineLayerProperties, LinePattern, LineLayoutProperties>;
|
|
using LayoutTypeSorted =
|
|
PatternLayout<LineBucket, LineLayerProperties, LinePattern, LineLayoutProperties, LineSortKey>;
|
|
auto layerProperties = staticImmutableCast<LineLayerProperties>(group.front());
|
|
if (layerProperties->layerImpl().layout.get<LineSortKey>().isUndefined()) {
|
|
return std::make_unique<LayoutTypeUnsorted>(parameters.bucketParameters, group, std::move(layer), parameters);
|
|
}
|
|
return std::make_unique<LayoutTypeSorted>(parameters.bucketParameters, group, std::move(layer), parameters);
|
|
}
|
|
|
|
std::unique_ptr<RenderLayer> LineLayerFactory::createRenderLayer(Immutable<style::Layer::Impl> impl) noexcept {
|
|
assert(impl->getTypeInfo() == getTypeInfo());
|
|
return std::make_unique<RenderLineLayer>(staticImmutableCast<style::LineLayer::Impl>(impl));
|
|
}
|
|
|
|
} // namespace mbgl
|