1 files changed, 33 insertions, 0 deletions
diff --git a/include/mbgl/style/property_expression.hpp b/include/mbgl/style/property_expression.hpp
index 7439ac9ca1..8502bfefbd 100644
--- a/include/mbgl/style/property_expression.hpp
+++ b/include/mbgl/style/property_expression.hpp
@@ -73,6 +73,20 @@ public:
                         finalDefaultValue);
     }
 
+    T evaluate(const GeometryTileFeature& feature, const CanonicalTileID& canonical, T finalDefaultValue) const {
+        return evaluate(expression::EvaluationContext(&feature).withCanonicalTileID(&canonical), finalDefaultValue);
+    }
+
+    T evaluate(const GeometryTileFeature& feature,
+               const std::set<std::string>& availableImages,
+               const CanonicalTileID& canonical,
+               T finalDefaultValue) const {
+        return evaluate(expression::EvaluationContext(&feature)
+                            .withAvailableImages(&availableImages)
+                            .withCanonicalTileID(&canonical),
+                        finalDefaultValue);
+    }
+
     T evaluate(float zoom, const GeometryTileFeature& feature, T finalDefaultValue) const {
         return evaluate(expression::EvaluationContext(zoom, &feature), finalDefaultValue);
     }
@@ -85,6 +99,25 @@ public:
                         finalDefaultValue);
     }
 
+    T evaluate(float zoom,
+               const GeometryTileFeature& feature,
+               const std::set<std::string>& availableImages,
+               const CanonicalTileID& canonical,
+               T finalDefaultValue) const {
+        return evaluate(expression::EvaluationContext(zoom, &feature)
+                            .withAvailableImages(&availableImages)
+                            .withCanonicalTileID(&canonical),
+                        finalDefaultValue);
+    }
+
+    T evaluate(float zoom,
+               const GeometryTileFeature& feature,
+               const CanonicalTileID& canonical,
+               T finalDefaultValue) const {
+        return evaluate(expression::EvaluationContext(zoom, &feature).withCanonicalTileID(&canonical),
+                        finalDefaultValue);
+    }
+
     T evaluate(float zoom, const GeometryTileFeature& feature, const FeatureState& state, T finalDefaultValue) const {
         assert(!isFeatureConstant());
         return evaluate(expression::EvaluationContext(zoom, &feature, &state), finalDefaultValue);