diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-11-06 16:11:47 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-11-13 17:28:26 +0200 |
| commit | bf8b24fa8d30df374ee36be781b6a572036187b9 (patch) | |
| tree | bdca15eef94898a879e4f3737eee2dc44efa275f /test/style | |
| parent | 4e15a0c8cd7c906908d97da10f75b35a3bc2ed9e (diff) | |
| download | qtlocation-mapboxgl-bf8b24fa8d30df374ee36be781b6a572036187b9.tar.gz | |
[build] Update to geometry v1.0.0
Diffstat (limited to 'test/style')
| -rw-r--r-- | test/style/filter.test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/style/filter.test.cpp b/test/style/filter.test.cpp index 9678fe0895..ef38a1a789 100644 --- a/test/style/filter.test.cpp +++ b/test/style/filter.test.cpp @@ -21,7 +21,7 @@ using namespace mbgl::style; bool filter(const char * json, const PropertyMap& featureProperties = {{}}, - optional<FeatureIdentifier> featureId = {}, + FeatureIdentifier featureId = {}, FeatureType featureType = FeatureType::Point, GeometryCollection featureGeometry = {}, float zoom = 0.0f) { @@ -81,7 +81,7 @@ std::string stringifyFilter(const char * json) { TEST(Filter, EqualsNull) { auto f = R"(["==", "foo", null])"; - ASSERT_TRUE(filter(f, {{ "foo", mapbox::geometry::null_value }})); + ASSERT_TRUE(filter(f, {{ "foo", mapbox::feature::null_value }})); ASSERT_FALSE(filter(f, {{ "foo", int64_t(0) }})); ASSERT_FALSE(filter(f, {{ "foo", int64_t(1) }})); @@ -107,7 +107,7 @@ TEST(Filter, EqualsNumber) { ASSERT_FALSE(filter(f, {{ "foo", std::string("0") }})); ASSERT_FALSE(filter(f, {{ "foo", false }})); ASSERT_FALSE(filter(f, {{ "foo", true }})); - ASSERT_FALSE(filter(f, {{ "foo", mapbox::geometry::null_value }})); + ASSERT_FALSE(filter(f, {{ "foo", mapbox::feature::null_value }})); ASSERT_FALSE(filter(f, {{}})); } |