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/style/layers/symbol_layer_impl.cpp | |
| parent | 59803d3025683a255737b5ae29bd7fc531a975a3 (diff) | |
| download | qtlocation-mapboxgl-0c0064c050396eae8dad92e5097692537405704a.tar.gz | |
[core] Get rid of user-specified refs
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer_impl.cpp')
| -rw-r--r-- | src/mbgl/style/layers/symbol_layer_impl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_impl.cpp b/src/mbgl/style/layers/symbol_layer_impl.cpp index 64968f51e4..8fb85513cf 100644 --- a/src/mbgl/style/layers/symbol_layer_impl.cpp +++ b/src/mbgl/style/layers/symbol_layer_impl.cpp @@ -29,7 +29,9 @@ std::unique_ptr<Bucket> SymbolLayer::Impl::createBucket(BucketParameters&, const return nullptr; } -std::unique_ptr<SymbolLayout> SymbolLayer::Impl::createLayout(BucketParameters& parameters, const GeometryTileLayer& layer) const { +std::unique_ptr<SymbolLayout> SymbolLayer::Impl::createLayout(BucketParameters& parameters, + const GeometryTileLayer& layer, + std::vector<std::unique_ptr<Layer>> group) const { PropertyEvaluationParameters p(parameters.tileID.overscaledZ); SymbolLayoutProperties::Evaluated evaluated = layout.evaluate(p); @@ -59,7 +61,7 @@ std::unique_ptr<SymbolLayout> SymbolLayer::Impl::createLayout(BucketParameters& evaluated.get<IconSize>() = layout.evaluate<IconSize>(PropertyEvaluationParameters(p.z + 1)); evaluated.get<TextSize>() = layout.evaluate<TextSize>(PropertyEvaluationParameters(p.z + 1)); - return std::make_unique<SymbolLayout>(id, + return std::make_unique<SymbolLayout>(std::move(group), layer.getName(), parameters.tileID.overscaleFactor(), parameters.tileID.overscaledZ, |