diff options
author | Lucas Wojciechowski <lucas@mapbox.com> | 2018-02-19 14:16:05 -0800 |
---|---|---|
committer | Lucas Wojciechowski <lucas@mapbox.com> | 2018-02-19 14:48:01 -0800 |
commit | 1352b1ddfa6606b98e616ce50e391839bf06203a (patch) | |
tree | bbbdd803d20108ae352a17d3b420fd201331f1e6 | |
parent | bbafd74a98ac9bf59af23c003a99fd385f1521c9 (diff) | |
download | qtlocation-mapboxgl-1352b1ddfa6606b98e616ce50e391839bf06203a.tar.gz |
Hook up expression filter evaluator
-rw-r--r-- | src/mbgl/style/filter_evaluator.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mbgl/style/filter_evaluator.cpp b/src/mbgl/style/filter_evaluator.cpp index 3645a01728..72022172f4 100644 --- a/src/mbgl/style/filter_evaluator.cpp +++ b/src/mbgl/style/filter_evaluator.cpp @@ -212,7 +212,12 @@ bool FilterEvaluator::operator()(const NotHasIdentifierFilter&) const { return !context.feature->getID(); } -bool FilterEvaluator::operator()(const ExpressionFilter&) const { +bool FilterEvaluator::operator()(const ExpressionFilter& filter) const { + const expression::EvaluationResult result = filter.expression->evaluate(context); + if (result) { + const optional<bool> typed = expression::fromExpressionValue<bool>(*result); + return typed ? *typed : false; + } return false; } |