diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/style/expression/expression.hpp | 5 | ||||
| -rw-r--r-- | include/mbgl/style/expression/within.hpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp index 1e34a8bd38..0fd5c4959e 100644 --- a/include/mbgl/style/expression/expression.hpp +++ b/include/mbgl/style/expression/expression.hpp @@ -191,6 +191,11 @@ public: const Feature& feature, optional<double> colorRampParameter, const std::set<std::string>& availableImages) const; + EvaluationResult evaluate(optional<float> zoom, + const Feature& feature, + optional<double> colorRampParameter, + const std::set<std::string>& availableImages, + const CanonicalTileID& canonical) const; EvaluationResult evaluate(optional<mbgl::Value> accumulated, const Feature& feature) const; /** diff --git a/include/mbgl/style/expression/within.hpp b/include/mbgl/style/expression/within.hpp index 88e9cc56b8..5cc36ab19c 100644 --- a/include/mbgl/style/expression/within.hpp +++ b/include/mbgl/style/expression/within.hpp @@ -31,10 +31,10 @@ public: return false; } - std::vector<optional<Value>> possibleOutputs() const override { return {{false}}; } + std::vector<optional<Value>> possibleOutputs() const override { return {{true}, {false}}; } mbgl::Value serialize() const override; - std::string getOperator() const override { return "Within"; } + std::string getOperator() const override { return "within"; } private: GeoJSON geoJSONSource; |