diff options
Diffstat (limited to 'src/mbgl/layout')
| -rw-r--r-- | src/mbgl/layout/pattern_layout.hpp | 8 | ||||
| -rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/mbgl/layout/pattern_layout.hpp b/src/mbgl/layout/pattern_layout.hpp index c6815e4cad..81ff3996db 100644 --- a/src/mbgl/layout/pattern_layout.hpp +++ b/src/mbgl/layout/pattern_layout.hpp @@ -108,7 +108,9 @@ public: const size_t featureCount = sourceLayer->featureCount(); for (size_t i = 0; i < featureCount; ++i) { auto feature = sourceLayer->getFeature(i); - if (!leaderLayerProperties->layerImpl().filter(style::expression::EvaluationContext { this->zoom, feature.get() })) + if (!leaderLayerProperties->layerImpl().filter( + style::expression::EvaluationContext(this->zoom, feature.get()) + .withCanonicalTileID(¶meters.tileID.canonical))) continue; PatternLayerMap patternDependencyMap; @@ -155,8 +157,8 @@ public: void createBucket(const ImagePositions& patternPositions, std::unique_ptr<FeatureIndex>& featureIndex, std::unordered_map<std::string, LayerRenderData>& renderData, - const bool, - const bool, + const bool /*firstLoad*/, + const bool /*showCollisionBoxes*/, const CanonicalTileID& canonical) override { auto bucket = std::make_shared<BucketType>(layout, layerPropertiesMap, zoom, overscaling); for (auto & patternFeature : features) { diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index a4890c85d1..e954a26a50 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -132,7 +132,8 @@ SymbolLayout::SymbolLayout(const BucketParameters& parameters, const size_t featureCount = sourceLayer->featureCount(); for (size_t i = 0; i < featureCount; ++i) { auto feature = sourceLayer->getFeature(i); - if (!leader.filter(expression::EvaluationContext { this->zoom, feature.get() })) + if (!leader.filter(expression::EvaluationContext(this->zoom, feature.get()) + .withCanonicalTileID(¶meters.tileID.canonical))) continue; SymbolFeature ft(std::move(feature)); |