From 352d63d2ce98286cd854b11e85d66440501a6fd0 Mon Sep 17 00:00:00 2001 From: Anand Thakker Date: Thu, 12 Apr 2018 16:02:48 -0400 Subject: 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) => ParsingContext(Type) --- platform/node/src/node_expression.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'platform/node') 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& 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)); -- cgit v1.2.1