1 files changed, 12 insertions, 0 deletions
diff --git a/src/mbgl/style/properties.hpp b/src/mbgl/style/properties.hpp
index 9d66f850de..db0e54330c 100644
--- a/src/mbgl/style/properties.hpp
+++ b/src/mbgl/style/properties.hpp
@@ -180,11 +180,23 @@ public:
                 });
         }
 
+        template <class T>
+        static T evaluate(float z, const GeometryTileFeature& feature, const FeatureState& state,
+                          const PossiblyEvaluatedPropertyValue<T>& v, const T& defaultValue) {
+            return v.match([&](const T& t) { return t; },
+                           [&](const PropertyExpression<T>& t) { return t.evaluate(z, feature, state, defaultValue); });
+        }
+
         template <class P>
         auto evaluate(float z, const GeometryTileFeature& feature) const {
             return evaluate(z, feature, this->template get<P>(), P::defaultValue());
         }
 
+        template <class P>
+        auto evaluate(float z, const GeometryTileFeature& feature, const FeatureState& state) const {
+            return evaluate(z, feature, state, this->template get<P>(), P::defaultValue());
+        }
+
         Evaluated evaluate(float z, const GeometryTileFeature& feature) const {
             return Evaluated {
                 evaluate<Ps>(z, feature)...