tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix extra collator dependency (#2330)

Browse Source
This commit is contained in:
Tim Sylvester
2024-04-24 18:21:08 -07:00
committed by GitHub
parent d22362ab22
commit 51a77b4b26
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mbgl/style/expression/collator_expression.cpp
View File

@@ -13,7 +13,9 @@ CollatorExpression::CollatorExpression(std::unique_ptr<Expression> caseSensitive
std::optional<std::unique_ptr<Expression>> locale_)
: Expression(Kind::CollatorExpression,
type::Collator,
depsOf(caseSensitive_) | depsOf(diacriticSensitive_) | depsOf(locale_)),
depsOf(caseSensitive_) | depsOf(diacriticSensitive_) | depsOf(locale_) |
// Collations are treated as feature-dependent. See `style::expression::isFeatureConstant`
Dependency::Feature),
caseSensitive(std::move(caseSensitive_)),
diacriticSensitive(std::move(diacriticSensitive_)),
locale(std::move(locale_)) {}

6
test/style/expression/dependency.test.cpp
View File

@@ -1,3 +1,4 @@
#include <mbgl/style/expression/collator_expression.hpp>
#include <mbgl/style/expression/dsl.hpp>
#include <mbgl/style/expression/format_section_override.hpp>
#include <mbgl/style/layers/custom_layer_impl.hpp>
@@ -77,3 +78,8 @@ TEST(ExpressionDependencies, CustomLayer) {
auto impl = makeMutable<CustomLayer::Impl>("", nullptr);
EXPECT_EQ(Dependency::None, CustomLayerProperties{std::move(impl)}.getDependencies());
}
TEST(ExpressionDependencies, Collation) {
auto collator = CollatorExpression(gt(literal(1.), zoom()), literal(true), literal("en-us"));
EXPECT_EQ(Dependency::Feature | Dependency::Zoom, collator.dependencies);
}