Add tests for linestring geometry (with and without split)

Author: joto

tests/CMakeLists.txt

@@ -76,6 +76,7 @@ if (HAVE_LUA)
     set_test(test-output-flex-attr)
     set_test(test-output-flex-bbox)
     set_test(test-output-flex-invalid-geom)
+    set_test(test-output-flex-line)
     set_test(test-output-flex-lua-fail)
     set_test(test-output-flex-nogeom)
     set_test(test-output-flex-uni)

tests/data/test_output_flex_line.lua

@@ -0,0 +1,24 @@
+
+local tables = {}
+
+tables.line = osm2pgsql.define_way_table('osm2pgsql_test_line', {
+    { column = 'tags', type = 'hstore' },
+    { column = 'geom', type = 'linestring' }
+})
+
+tables.split = osm2pgsql.define_way_table('osm2pgsql_test_split', {
+    { column = 'tags', type = 'hstore' },
+    { column = 'geom', type = 'linestring' }
+})
+
+function osm2pgsql.process_way(object)
+    tables.line:add_row({
+        tags= object.tags,
+        geom = { create = 'line' }
+    })
+    tables.split:add_row({
+        tags = object.tags,
+        geom = { create = 'line', split_at = 1.0 }
+    })
+end
+

tests/test-output-flex-line.cpp

@@ -0,0 +1,37 @@
+#include <catch.hpp>
+
+#include "common-import.hpp"
+#include "common-options.hpp"
+
+static testing::db::import_t db;
+
+static char const *const conf_file = "test_output_flex_line.lua";
+
+TEST_CASE("linestring in latlon projection (unsplit and split)")
+{
+    options_t const options =
+        testing::opt_t().flex(conf_file).srs(PROJ_LATLONG);
+
+    REQUIRE_NOTHROW(db.run_import(options,
+                                  "n10 v1 dV x1.0 y1.0\n"
+                                  "n11 v1 dV x1.0 y2.0\n"
+                                  "n12 v1 dV x1.0 y3.5\n"
+                                  "w20 v1 dV Thighway=primary Nn10,n11\n"
+                                  "w21 v1 dV Thighway=primary Nn10,n12\n"));
+
+    auto conn = db.db().connect();
+
+    REQUIRE(2 == conn.get_count("osm2pgsql_test_line"));
+    REQUIRE(4 == conn.get_count("osm2pgsql_test_split"));
+    REQUIRE(4 ==
+            conn.get_count("osm2pgsql_test_split", "ST_Length(geom) <= 1.0"));
+
+    REQUIRE(1 == conn.get_count("osm2pgsql_test_split", "way_id=20"));
+    REQUIRE(3 == conn.get_count("osm2pgsql_test_split", "way_id=21"));
+
+    REQUIRE(2 == conn.get_count("osm2pgsql_test_split",
+                                "way_id=21 AND ST_Length(geom) = 1.0"));
+
+    conn.assert_double(
+        1.0, "SELECT ST_Length(geom) FROM osm2pgsql_test_line WHERE way_id=20");
+}

tests/test-output-flex.cpp

@@ -28,19 +28,6 @@ TEST_CASE("liechtenstein slim regression simple")
     CHECK(2932 == conn.get_count("osm2pgsql_test_line"));
     CHECK(4136 == conn.get_count("osm2pgsql_test_polygon"));
     CHECK(35 == conn.get_count("osm2pgsql_test_route"));
-
-    // Check size of lines
-    conn.assert_double(
-        1696.04,
-        "SELECT ST_Length(geom) FROM osm2pgsql_test_line WHERE osm_id = 1101");
-    conn.assert_double(1151.26,
-                       "SELECT ST_Length(ST_Transform(geom,4326)::geography) "
-                       "FROM osm2pgsql_test_line WHERE osm_id = 1101");
-
-    // Check a point's location
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_point",
-                                "ST_DWithin(geom, 'SRID=3857;POINT(1062645.12 "
-                                "5972593.4)'::geometry, 0.1)"));
 }
 
 TEST_CASE("liechtenstein slim latlon")
@@ -56,19 +43,6 @@ TEST_CASE("liechtenstein slim latlon")
     REQUIRE(1362 == conn.get_count("osm2pgsql_test_point"));
     REQUIRE(2932 == conn.get_count("osm2pgsql_test_line"));
     REQUIRE(4136 == conn.get_count("osm2pgsql_test_polygon"));
-
-    // Check size of lines
-    conn.assert_double(
-        0.0105343,
-        "SELECT ST_Length(geom) FROM osm2pgsql_test_line WHERE osm_id = 1101");
-    conn.assert_double(1151.26,
-                       "SELECT ST_Length(ST_Transform(geom,4326)::geography) "
-                       "FROM osm2pgsql_test_line WHERE osm_id = 1101");
-
-    // Check a point's location
-    REQUIRE(1 == conn.get_count("osm2pgsql_test_point",
-                                "ST_DWithin(geom, 'SRID=4326;POINT(9.5459035 "
-                                "47.1866494)'::geometry, 0.00001)"));
 }
 
 TEST_CASE("way area slim flatnode")