diff options
Diffstat (limited to 'src/mbgl/renderer/possibly_evaluated_property_value.hpp')
| -rw-r--r-- | src/mbgl/renderer/possibly_evaluated_property_value.hpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mbgl/renderer/possibly_evaluated_property_value.hpp b/src/mbgl/renderer/possibly_evaluated_property_value.hpp index 1198e43aae..5e412855a4 100644 --- a/src/mbgl/renderer/possibly_evaluated_property_value.hpp +++ b/src/mbgl/renderer/possibly_evaluated_property_value.hpp @@ -93,16 +93,19 @@ public: } template <class Feature> - Faded<T> evaluate(const Feature& feature, float zoom, T defaultValue) const { + Faded<T> evaluate(const Feature& feature, + float zoom, + const std::set<std::string>& availableImages, + T defaultValue) const { return this->match( [&] (const Faded<T>& constant_) { return constant_; }, [&] (const style::PropertyExpression<T>& expression) { if (!expression.isZoomConstant()) { - const T min = expression.evaluate(floor(zoom), feature, defaultValue); - const T max = expression.evaluate(floor(zoom) + 1, feature, defaultValue); + const T min = expression.evaluate(floor(zoom), feature, availableImages, defaultValue); + const T max = expression.evaluate(floor(zoom) + 1, feature, availableImages, defaultValue); return Faded<T> {min, max}; } else { - const T evaluated = expression.evaluate(feature, defaultValue); + const T evaluated = expression.evaluate(feature, availableImages, defaultValue); return Faded<T> {evaluated, evaluated}; } } |