From 0c0064c050396eae8dad92e5097692537405704a Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 19 Dec 2016 17:10:51 -0800 Subject: [core] Get rid of user-specified refs --- src/mbgl/style/layers/symbol_layer_impl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/mbgl/style/layers/symbol_layer_impl.cpp') 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 SymbolLayer::Impl::createBucket(BucketParameters&, const return nullptr; } -std::unique_ptr SymbolLayer::Impl::createLayout(BucketParameters& parameters, const GeometryTileLayer& layer) const { +std::unique_ptr SymbolLayer::Impl::createLayout(BucketParameters& parameters, + const GeometryTileLayer& layer, + std::vector> group) const { PropertyEvaluationParameters p(parameters.tileID.overscaledZ); SymbolLayoutProperties::Evaluated evaluated = layout.evaluate(p); @@ -59,7 +61,7 @@ std::unique_ptr SymbolLayer::Impl::createLayout(BucketParameters& evaluated.get() = layout.evaluate(PropertyEvaluationParameters(p.z + 1)); evaluated.get() = layout.evaluate(PropertyEvaluationParameters(p.z + 1)); - return std::make_unique(id, + return std::make_unique(std::move(group), layer.getName(), parameters.tileID.overscaleFactor(), parameters.tileID.overscaledZ, -- cgit v1.2.1