summaryrefslogtreecommitdiff
path: root/expression-test/expression_test_runner.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'expression-test/expression_test_runner.cpp')
-rw-r--r--expression-test/expression_test_runner.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/expression-test/expression_test_runner.cpp b/expression-test/expression_test_runner.cpp
index 436e449921..c0d4511636 100644
--- a/expression-test/expression_test_runner.cpp
+++ b/expression-test/expression_test_runner.cpp
@@ -104,8 +104,14 @@ TestRunOutput runExpressionTest(TestData& data, const std::string& rootPath, con
std::vector<Value> outputs;
if (!data.inputs.empty()) {
for (const auto& input : data.inputs) {
- auto evaluationResult =
- expression->evaluate(input.zoom, input.feature, input.heatmapDensity, input.availableImages);
+ mbgl::style::expression::EvaluationResult evaluationResult;
+ if (input.canonical) {
+ evaluationResult = expression->evaluate(
+ input.zoom, input.feature, input.heatmapDensity, input.availableImages, *input.canonical);
+ } else {
+ evaluationResult =
+ expression->evaluate(input.zoom, input.feature, input.heatmapDensity, input.availableImages);
+ }
if (!evaluationResult) {
std::unordered_map<std::string, Value> error{{"error", Value{evaluationResult.error().message}}};
outputs.emplace_back(Value{std::move(error)});