[core] PropertyExpression zoom evaluation should not assume zoom is non-constantupstream/property-expression-zoom-non-constant

1 files changed, 4 insertions, 5 deletions

diff --git a/include/mbgl/style/property_expression.hpp b/include/mbgl/style/property_expression.hpp
index b198de02b2..db802eb7c3 100644
--- a/include/mbgl/style/property_expression.hpp
+++ b/include/mbgl/style/property_expression.hpp
@@ -25,8 +25,7 @@ public:
     bool isFeatureConstant() const { return expression::isFeatureConstant(*expression); }
 
     T evaluate(float zoom) const {
-        assert(!expression::isZoomConstant(*expression));
-        assert(expression::isFeatureConstant(*expression));
+        assert(isFeatureConstant());
         const expression::EvaluationResult result = expression->evaluate(expression::EvaluationContext(zoom, nullptr));
         if (result) {
             const optional<T> typed = expression::fromExpressionValue<T>(*result);
@@ -37,8 +36,8 @@ public:
 
     template <class Feature>
     T evaluate(const Feature& feature, T finalDefaultValue) const {
-        assert(expression::isZoomConstant(*expression));
-        assert(!expression::isFeatureConstant(*expression));
+        assert(isZoomConstant());
+        assert(!isFeatureConstant());
         const expression::EvaluationResult result = expression->evaluate(expression::EvaluationContext(&feature));
         if (result) {
             const optional<T> typed = expression::fromExpressionValue<T>(*result);
@@ -49,7 +48,7 @@ public:
 
     template <class Feature>
     T evaluate(float zoom, const Feature& feature, T finalDefaultValue) const {
-        assert(!expression::isFeatureConstant(*expression));
+        assert(!isFeatureConstant());
         const expression::EvaluationResult result = expression->evaluate(expression::EvaluationContext({zoom}, &feature));
         if (result) {
             const optional<T> typed = expression::fromExpressionValue<T>(*result);