Move all area size checks from base tests into flex-area tests

Author: joto

tests/test-output-flex-area.cpp

@@ -20,9 +20,19 @@ TEST_CASE("area calculation in default projection")
     conn.assert_double(
         1.23927e+10,
         "SELECT area FROM osm2pgsql_test_polygon WHERE name='poly'");
+    conn.assert_double(
+        1.23927e+10,
+        "SELECT ST_Area(geom) FROM osm2pgsql_test_polygon WHERE name='poly'");
+    conn.assert_double(1.0, "SELECT ST_Area(ST_Transform(geom, 4326)) "
+                            "FROM osm2pgsql_test_polygon WHERE name='poly'");
     conn.assert_double(
         9.91828e+10,
         "SELECT area FROM osm2pgsql_test_polygon WHERE name='multi'");
+    conn.assert_double(
+        9.91828e+10,
+        "SELECT ST_Area(geom) FROM osm2pgsql_test_polygon WHERE name='multi'");
+    conn.assert_double(8.0, "SELECT ST_Area(ST_Transform(geom, 4326)) "
+                            "FROM osm2pgsql_test_polygon WHERE name='multi'");
 }
 
 TEST_CASE("area calculation in latlon projection")
@@ -37,8 +47,14 @@ TEST_CASE("area calculation in latlon projection")
     REQUIRE(2 == conn.get_count("osm2pgsql_test_polygon"));
     conn.assert_double(
         1.0, "SELECT area FROM osm2pgsql_test_polygon WHERE name='poly'");
+    conn.assert_double(
+        1.0,
+        "SELECT ST_Area(geom) FROM osm2pgsql_test_polygon WHERE name='poly'");
     conn.assert_double(
         8.0, "SELECT area FROM osm2pgsql_test_polygon WHERE name='multi'");
+    conn.assert_double(
+        8.0,
+        "SELECT ST_Area(geom) FROM osm2pgsql_test_polygon WHERE name='multi'");
 }
 
 TEST_CASE("area calculation in latlon projection with way area reprojection")
@@ -54,7 +70,13 @@ TEST_CASE("area calculation in latlon projection with way area reprojection")
     conn.assert_double(
         1.23927e+10,
         "SELECT area FROM osm2pgsql_test_polygon WHERE name='poly'");
+    conn.assert_double(
+        1.0,
+        "SELECT ST_Area(geom) FROM osm2pgsql_test_polygon WHERE name='poly'");
     conn.assert_double(
         9.91828e+10,
         "SELECT area FROM osm2pgsql_test_polygon WHERE name='multi'");
+    conn.assert_double(
+        8.0,
+        "SELECT ST_Area(geom) FROM osm2pgsql_test_polygon WHERE name='multi'");
 }

tests/test-output-flex.cpp

@@ -37,15 +37,6 @@ TEST_CASE("liechtenstein slim regression simple")
                        "SELECT ST_Length(ST_Transform(geom,4326)::geography) "
                        "FROM osm2pgsql_test_line WHERE osm_id = 1101");
 
-    conn.assert_double(
-        311.289, "SELECT area FROM osm2pgsql_test_polygon WHERE osm_id = 3265");
-    conn.assert_double(
-        311.289,
-        "SELECT ST_Area(geom) FROM osm2pgsql_test_polygon WHERE osm_id = 3265");
-    conn.assert_double(
-        143.845, "SELECT ST_Area(ST_Transform(geom,4326)::geography) FROM "
-                 "osm2pgsql_test_polygon WHERE osm_id = 3265");
-
     // Check a point's location
     REQUIRE(1 == conn.get_count("osm2pgsql_test_point",
                                 "ST_DWithin(geom, 'SRID=3857;POINT(1062645.12 "
@@ -74,16 +65,6 @@ TEST_CASE("liechtenstein slim latlon")
                        "SELECT ST_Length(ST_Transform(geom,4326)::geography) "
                        "FROM osm2pgsql_test_line WHERE osm_id = 1101");
 
-    conn.assert_double(
-        1.70718e-08,
-        "SELECT area FROM osm2pgsql_test_polygon WHERE osm_id = 3265");
-    conn.assert_double(
-        1.70718e-08,
-        "SELECT ST_Area(geom) FROM osm2pgsql_test_polygon WHERE osm_id = 3265");
-    conn.assert_double(
-        143.845, "SELECT ST_Area(ST_Transform(geom,4326)::geography) FROM "
-                 "osm2pgsql_test_polygon WHERE osm_id = 3265");
-
     // Check a point's location
     REQUIRE(1 == conn.get_count("osm2pgsql_test_point",
                                 "ST_DWithin(geom, 'SRID=4326;POINT(9.5459035 "