diff options
author | zmiao <miao.zhao@mapbox.com> | 2020-02-07 15:34:01 +0200 |
---|---|---|
committer | zmiao <miao.zhao@mapbox.com> | 2020-02-12 12:24:05 +0200 |
commit | 2963afa010e75bb8bc3c20150c06c5779121077d (patch) | |
tree | 009843afa585563a0bb0d2dfee41edfe1ec70baf /include | |
parent | 1bd2ccf2398004b02b479e6ad3144f52e7631b2a (diff) | |
download | qtlocation-mapboxgl-2963afa010e75bb8bc3c20150c06c5779121077d.tar.gz |
Add support for expression test
Fix polygon within algorithm
Add Unit tests
Fix incorrect metrics folder for ios-render-test-runner job
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; |