diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-12-19 17:10:51 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-01-04 17:38:33 -0800 |
commit | 0c0064c050396eae8dad92e5097692537405704a (patch) | |
tree | 5eb3c975fc4295b7fcbc244258f8facbc1f7e30a /src/mbgl/layout | |
parent | 59803d3025683a255737b5ae29bd7fc531a975a3 (diff) | |
download | qtlocation-mapboxgl-0c0064c050396eae8dad92e5097692537405704a.tar.gz |
[core] Get rid of user-specified refs
Diffstat (limited to 'src/mbgl/layout')
-rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 7 | ||||
-rw-r--r-- | src/mbgl/layout/symbol_layout.hpp | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index 351858f6f8..85e0b19609 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -3,6 +3,7 @@ #include <mbgl/layout/clip_lines.hpp> #include <mbgl/renderer/symbol_bucket.hpp> #include <mbgl/style/filter_evaluator.hpp> +#include <mbgl/style/layer.hpp> #include <mbgl/sprite/sprite_atlas.hpp> #include <mbgl/text/glyph_atlas.hpp> #include <mbgl/text/get_anchors.hpp> @@ -26,7 +27,7 @@ namespace mbgl { using namespace style; -SymbolLayout::SymbolLayout(std::string bucketName_, +SymbolLayout::SymbolLayout(std::vector<std::unique_ptr<Layer>> layers_, std::string sourceLayerName_, uint32_t overscaling_, float zoom_, @@ -36,7 +37,7 @@ SymbolLayout::SymbolLayout(std::string bucketName_, style::SymbolLayoutProperties::Evaluated layout_, float textMaxSize_, SpriteAtlas& spriteAtlas_) - : bucketName(std::move(bucketName_)), + : layers(std::move(layers_)), sourceLayerName(std::move(sourceLayerName_)), overscaling(overscaling_), zoom(zoom_), @@ -253,7 +254,7 @@ void SymbolLayout::addFeature(const SymbolFeature& feature, ? SymbolPlacementType::Point : layout.get<SymbolPlacement>(); const float textRepeatDistance = symbolSpacing / 2; - IndexedSubfeature indexedFeature = {feature.index, sourceLayerName, bucketName, symbolInstances.size()}; + IndexedSubfeature indexedFeature = {feature.index, sourceLayerName, layers.at(0)->getID(), symbolInstances.size()}; auto addSymbolInstance = [&] (const GeometryCoordinates& line, Anchor& anchor) { // https://github.com/mapbox/vector-tile-spec/tree/master/2.1#41-layers diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index 18fb9ff4bc..63c0a8859d 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -21,13 +21,14 @@ class SymbolBucket; namespace style { class Filter; +class Layer; } // namespace style struct Anchor; class SymbolLayout { public: - SymbolLayout(std::string bucketName_, + SymbolLayout(std::vector<std::unique_ptr<style::Layer>>, std::string sourceLayerName_, uint32_t overscaling, float zoom, @@ -55,7 +56,7 @@ public: State state = Pending; - const std::string bucketName; + const std::vector<std::unique_ptr<style::Layer>> layers; const std::string sourceLayerName; private: |