use explicit type for std::array

mapnik · May 18, 2024 · 21276ab · 21276ab
1 parent 9292899
commit 21276ab
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/test/unit/datasource/geojson.cpp b/test/unit/datasource/geojson.cpp
@@ -36,6 +36,8 @@
 #include <algorithm>
 #include <cctype>
 #include <locale>
+#include <string_view>
+#include <array>
 
 /*
 
@@ -151,18 +153,19 @@ TEST_CASE("geojson")
                 REQUIRE(json == json_out);
             }
 
-            constexpr auto invalid_empty_geometries =
-              std::array{"{ \"type\": \"Point\", \"coordinates\": [] }",
-                         "{ \"type\": \"LineString\", \"coordinates\": [[]] }",
-                         "{ \"type\": \"Polygon\", \"coordinates\": [[[]]] }",
-                         "{ \"type\": \"MultiPoint\", \"coordinates\": [[]] }",
-                         "{ \"type\": \"MultiLineString\", \"coordinates\": [[[]]] }",
-                         "{ \"type\": \"MultiPolygon\", \"coordinates\": [[[[]]]] }"};
+            constexpr std::array<std::string_view, 6> invalid_empty_geometries{
+              "{ \"type\": \"Point\", \"coordinates\": [] }",
+              "{ \"type\": \"LineString\", \"coordinates\": [[]] }",
+              "{ \"type\": \"Polygon\", \"coordinates\": [[[]]] }",
+              "{ \"type\": \"MultiPoint\", \"coordinates\": [[]] }",
+              "{ \"type\": \"MultiLineString\", \"coordinates\": [[[]]] }",
+              "{ \"type\": \"MultiPolygon\", \"coordinates\": [[[[]]]] }",
+            };
 
             for (auto&& json : invalid_empty_geometries)
             {
                 mapnik::geometry::geometry<double> geom;
-                CHECK(!mapnik::json::from_geojson(json, geom));
+                CHECK(!mapnik::json::from_geojson(std::string{json}, geom));
             }
         }