[build] Update to geometry v1.0.0

2 files changed, 13 insertions, 17 deletions

diff --git a/test/tile/custom_geometry_tile.test.cpp b/test/tile/custom_geometry_tile.test.cpp
index 21a3dd7953..dc6aaab1ac 100644
--- a/test/tile/custom_geometry_tile.test.cpp
+++ b/test/tile/custom_geometry_tile.test.cpp
@@ -50,8 +50,8 @@ TEST(CustomGeometryTile, InvokeFetchTile) {
 
     CircleLayer layer("circle", "source");
 
-    mapbox::geometry::feature_collection<double> features;
-    features.push_back(mapbox::geometry::feature<double> {
+    mapbox::feature::feature_collection<double> features;
+    features.push_back(mapbox::feature::feature<double> {
         mapbox::geometry::point<double>(0, 0)
     });
     CustomTileLoader loader([&](const CanonicalTileID& tileId) {
@@ -62,7 +62,7 @@ TEST(CustomGeometryTile, InvokeFetchTile) {
     });
     auto mb =std::make_shared<Mailbox>(*Scheduler::GetCurrent());
     ActorRef<CustomTileLoader> loaderActor(loader, mb);
-    
+
     CustomGeometryTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, CustomGeometrySource::TileOptions(),
     loaderActor);
 
@@ -76,8 +76,8 @@ TEST(CustomGeometryTile, InvokeCancelTile) {
 
     CircleLayer layer("circle", "source");
 
-    mapbox::geometry::feature_collection<double> features;
-    features.push_back(mapbox::geometry::feature<double> {
+    mapbox::feature::feature_collection<double> features;
+    features.push_back(mapbox::feature::feature<double> {
         mapbox::geometry::point<double>(0, 0)
     });
 
@@ -87,7 +87,7 @@ TEST(CustomGeometryTile, InvokeCancelTile) {
     });
     auto mb =std::make_shared<Mailbox>(*Scheduler::GetCurrent());
     ActorRef<CustomTileLoader> loaderActor(loader, mb);
-    
+
     CustomGeometryTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, CustomGeometrySource::TileOptions(),
     loaderActor);
 
@@ -101,15 +101,15 @@ TEST(CustomGeometryTile, InvokeTileChanged) {
 
     CircleLayer layer("circle", "source");
 
-    mapbox::geometry::feature_collection<double> features;
-    features.push_back(mapbox::geometry::feature<double> {
+    mapbox::feature::feature_collection<double> features;
+    features.push_back(mapbox::feature::feature<double> {
         mapbox::geometry::point<double>(0, 0)
     });
 
     CustomTileLoader loader(nullptr, nullptr);
     auto mb =std::make_shared<Mailbox>(*Scheduler::GetCurrent());
     ActorRef<CustomTileLoader> loaderActor(loader, mb);
-    
+
     CustomGeometryTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, CustomGeometrySource::TileOptions(),
     loaderActor);
 
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp
index c05e04bc8d..fb5f3ca6d7 100644
--- a/test/tile/geojson_tile.test.cpp
+++ b/test/tile/geojson_tile.test.cpp
@@ -50,10 +50,8 @@ TEST(GeoJSONTile, Issue7648) {
 
     CircleLayer layer("circle", "source");
 
-    mapbox::geometry::feature_collection<int16_t> features;
-    features.push_back(mapbox::geometry::feature<int16_t> {
-        mapbox::geometry::point<int16_t>(0, 0)
-    });
+    mapbox::feature::feature_collection<int16_t> features;
+    features.push_back(mapbox::feature::feature<int16_t> { mapbox::geometry::point<int16_t>(0, 0) });
 
     GeoJSONTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, features);
 
@@ -84,10 +82,8 @@ TEST(GeoJSONTile, Issue9927) {
 
     CircleLayer layer("circle", "source");
 
-    mapbox::geometry::feature_collection<int16_t> features;
-    features.push_back(mapbox::geometry::feature<int16_t> {
-        mapbox::geometry::point<int16_t>(0, 0)
-    });
+    mapbox::feature::feature_collection<int16_t> features;
+    features.push_back(mapbox::feature::feature<int16_t> { mapbox::geometry::point<int16_t>(0, 0) });
 
     GeoJSONTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, features);