diff options
author | Anand Thakker <anandthakker@users.noreply.github.com> | 2018-04-12 16:02:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-12 16:02:48 -0400 |
commit | 352d63d2ce98286cd854b11e85d66440501a6fd0 (patch) | |
tree | 08a6cc5140ddf044590ce82a44b7f2e0a920638c /platform/node | |
parent | 646cbc98ddaa8f6afe84c96888c877628bf405ca (diff) | |
download | qtlocation-mapboxgl-352d63d2ce98286cd854b11e85d66440501a6fd0.tar.gz |
Don't enforce ["zoom"] constraints for filters (#11672)
* Don't enforce ["zoom"] constraints for filters
Fixes #11594
* Add a couple of comments
* Fix ambiguous constructor call
* ParsingContext(optional<Type>) => ParsingContext(Type)
Diffstat (limited to 'platform/node')
-rw-r--r-- | platform/node/src/node_expression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/node/src/node_expression.cpp b/platform/node/src/node_expression.cpp index 84515060a3..27866ccbed 100644 --- a/platform/node/src/node_expression.cpp +++ b/platform/node/src/node_expression.cpp @@ -75,8 +75,8 @@ void NodeExpression::Parse(const Nan::FunctionCallbackInfo<v8::Value>& info) { auto expr = info[0]; try { - ParsingContext ctx(expected); - ParseResult parsed = ctx.parse(mbgl::style::conversion::Convertible(expr)); + ParsingContext ctx = expected ? ParsingContext(*expected) : ParsingContext(); + ParseResult parsed = ctx.parseLayerPropertyExpression(mbgl::style::conversion::Convertible(expr)); if (parsed) { assert(ctx.getErrors().size() == 0); auto nodeExpr = new NodeExpression(std::move(*parsed)); |