Disable geometry validity check in flex output for point geometries

Point geometries are always valid.

Author: joto

src/flex-table-column.hpp

@@ -87,6 +87,18 @@ class flex_table_column_t
                (m_type <= table_column_type::multipolygon);
     }
 
+    /**
+     * Do we need an ST_IsValid() check in the database for this geometry
+     * column? If the SRID is 4326 the geometry validity is already assured
+     * by libosmium, so we don't need it. And Point geometries are always
+     * valid.
+     */
+    bool needs_isvalid() const noexcept
+    {
+        assert(is_geometry_column());
+        return m_srid != 4326 && m_type != table_column_type::point;
+    }
+
     std::string const &type_name() const noexcept { return m_type_name; }
 
     bool not_null() const noexcept { return m_not_null; }

src/flex-table.cpp

@@ -177,7 +177,8 @@ void table_connection_t::start(bool append)
                                       : flex_table_t::table_type::permanent,
             table().full_name()));
 
-        if (table().has_geom_column() && table().geom_column().srid() != 4326) {
+        if (table().has_geom_column() &&
+            table().geom_column().needs_isvalid()) {
             create_geom_check_trigger(m_db_connection.get(), table().schema(),
                                       table().name(),
                                       table().geom_column().name());
@@ -260,7 +261,8 @@ void table_connection_t::stop(bool updateable, bool append)
     if (updateable && table().has_id_column()) {
         create_id_index();
 
-        if (table().has_geom_column() && table().geom_column().srid() != 4326) {
+        if (table().has_geom_column() &&
+            table().geom_column().needs_isvalid()) {
             create_geom_check_trigger(m_db_connection.get(), table().schema(),
                                       table().name(),
                                       table().geom_column().name());

tests/data/test_output_flex_schema.lua

@@ -1,7 +1,7 @@
 
-local dtable = osm2pgsql.define_node_table('osm2pgsql_test_point', {
+local dtable = osm2pgsql.define_way_table('osm2pgsql_test_line', {
     { column = 'tags', type = 'hstore' },
-    { column = 'geom', type = 'point' },
+    { column = 'geom', type = 'linestring' },
 }, { schema = 'myschema' })
 
 local delete_keys = {
@@ -12,13 +12,14 @@ local delete_keys = {
 
 local clean_tags = osm2pgsql.make_clean_tags_func(delete_keys)
 
-function osm2pgsql.process_node(object)
+function osm2pgsql.process_way(object)
     if clean_tags(object.tags) then
         return
     end
 
     dtable:add_row({
-        tags = object.tags
+        tags = object.tags,
+        geom = { create = 'line' }
     })
 end
 

tests/test-output-flex-schema.cpp

@@ -29,14 +29,14 @@ TEST_CASE("config with schema should work")
     REQUIRE(1 == conn.get_count("pg_namespace", "nspname = 'myschema'"));
     REQUIRE(1 == conn.get_count("pg_tables", "schemaname = 'myschema'"));
 
-    REQUIRE(1362 == conn.get_count("myschema.osm2pgsql_test_point"));
+    REQUIRE(7103 == conn.get_count("myschema.osm2pgsql_test_line"));
 
     REQUIRE(1 ==
             conn.get_count("pg_proc",
-                           "proname = 'osm2pgsql_test_point_osm2pgsql_valid'"));
+                           "proname = 'osm2pgsql_test_line_osm2pgsql_valid'"));
 
     REQUIRE(1 == conn.get_count("pg_trigger"));
     REQUIRE(1 ==
             conn.get_count("pg_trigger",
-                           "tgname = 'osm2pgsql_test_point_osm2pgsql_valid'"));
+                           "tgname = 'osm2pgsql_test_line_osm2pgsql_valid'"));
 }