summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkevin <kevin.li@mapbox.com>2020-02-12 19:51:26 +0800
committerkevin <kevin.li@mapbox.com>2020-02-15 08:53:20 +0800
commit47d470a923c94b9cc872374220287baa90706e7f (patch)
tree37a42ad2384250305751f261a3b1829b612f903b
parent0e0bed8da2a6ceea0a499f5547115653a5d1a833 (diff)
downloadqtlocation-mapboxgl-47d470a923c94b9cc872374220287baa90706e7f.tar.gz
[core] Update changelog.
-rw-r--r--CHANGELOG.md8
-rw-r--r--CMakeLists.txt1
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb643dd222..4963c3f87f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,9 +22,13 @@
The `within expression` enables checking whether a feature is inside a pre-defined geometry set/boundary or not. This `within expression` returns a boolean value, `true` indicates that the feature being evaluated is inside the geometry set. The returned value can be then consumed as input by another expression or used directly by a paint/layer property.
- Support for using `within expression` with layout propery will be implemented separately.
+ Support for using `within expression` with layout property will be implemented separately.
-- [core] Add support for using `within expression` with layout propery. ([#16194](https://github.com/mapbox/mapbox-gl-native/pull/16194))
+- [core] Add support for using `within expression` with layout property. ([#16194](https://github.com/mapbox/mapbox-gl-native/pull/16194))
+
+- [core] Add support for `in expression`. ([#16162](https://github.com/mapbox/mapbox-gl-native/pull/16162))
+
+ The `in expression` enables checking whether a Number/String/Boolean type needle is in a String/Array and returns a boolean value.
### 🐞 Bug fixes
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4428b38b53..deb000db9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,6 +195,7 @@ add_library(
${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/get_covering_stops.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/image.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/image_expression.hpp
+ ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/in.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/interpolate.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/interpolator.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/is_constant.hpp