Process untagged ways/relations in stage 1b/c correctly

src/output-flex.cpp

@@ -835,7 +835,7 @@ void output_flex_t::get_mutex_and_call_lua_function(
 
 void output_flex_t::pending_way(osmid_t id)
 {
-    if (!m_process_way) {
+    if (!m_process_way && !m_process_untagged_way) {
         return;
     }
 
@@ -844,8 +844,11 @@ void output_flex_t::pending_way(osmid_t id)
     }
 
     way_delete(id);
-
-    get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
+    auto const &func = m_way_cache.get().tags().empty() ? m_process_untagged_way
+                                                        : m_process_way;
+    if (func) {
+        get_mutex_and_call_lua_function(func, m_way_cache.get());
+    }
 }
 
 void output_flex_t::select_relation_members()
@@ -892,9 +895,20 @@ void output_flex_t::select_relation_members(osmid_t id)
     select_relation_members();
 }
 
+void output_flex_t::process_relation()
+{
+    auto const &func = m_relation_cache.get().tags().empty()
+                           ? m_process_untagged_relation
+                           : m_process_relation;
+    if (func) {
+        get_mutex_and_call_lua_function(func, m_relation_cache.get());
+    }
+}
+
 void output_flex_t::pending_relation(osmid_t id)
 {
-    if (!m_process_relation && !m_select_relation_members) {
+    if (!m_process_relation && !m_process_untagged_relation &&
+        !m_select_relation_members) {
         return;
     }
 
@@ -904,16 +918,12 @@ void output_flex_t::pending_relation(osmid_t id)
 
     select_relation_members();
     delete_from_tables(osmium::item_type::relation, id);
-
-    if (m_process_relation) {
-        get_mutex_and_call_lua_function(m_process_relation,
-                                        m_relation_cache.get());
-    }
+    process_relation();
 }
 
 void output_flex_t::pending_relation_stage1c(osmid_t id)
 {
-    if (!m_process_relation) {
+    if (!m_process_relation && !m_process_untagged_relation) {
         return;
     }
 
@@ -922,7 +932,7 @@ void output_flex_t::pending_relation_stage1c(osmid_t id)
     }
 
     m_disable_insert = true;
-    get_mutex_and_call_lua_function(m_process_relation, m_relation_cache.get());
+    process_relation();
     m_disable_insert = false;
 }
 

src/output-flex.hpp

@@ -196,6 +196,8 @@ class output_flex_t : public output_t
     void get_mutex_and_call_lua_function(prepared_lua_function_t func,
                                          osmium::OSMObject const &object);
 
+    void process_relation();
+
     void init_lua(std::string const &filename, properties_t const &properties);
 
     void check_context_and_state(char const *name, char const *context,

tests/bdd/flex/untagged.feature

@@ -0,0 +1,94 @@
+Feature: Adding untagged objects to a flex database
+
+    Scenario: Import with normal and "untagged" callbacks
+        Given the style file 'test_output_flex_untagged.lua'
+        And the OSM data
+            """
+            n11 v1 dV x1 y1
+            n12 v1 dV x2 y2
+            n13 v1 dV x3 y3
+            n14 v1 dV Tamenity=restaurant x4 y4
+            w20 v1 dV Thighway=primary Nn11,n12
+            w21 v1 dV Nn13,n14
+            r30 v1 dV Mn11@,w20@
+            r31 v1 dV Ttype=route Mw20@
+            """
+        When running osm2pgsql flex
+        Then table osm2pgsql_test_nodes contains exactly
+            | node_id | tagged | tags |
+            | 11      | False  | {} |
+            | 12      | False  | {} |
+            | 13      | False  | {} |
+            | 14      | True   | {'amenity': 'restaurant'} |
+
+        Then table osm2pgsql_test_ways contains exactly
+            | way_id | tagged | tags |
+            | 20     | True   | {'highway': 'primary'} |
+            | 21     | False  | {} |
+
+        Then table osm2pgsql_test_relations contains exactly
+            | relation_id | tagged | tags |
+            | 30          | False  | {} |
+            | 31          | True   | {'type': 'route'} |
+
+    Scenario: Import then update with normal and "untagged" callbacks
+        Given the style file 'test_output_flex_untagged.lua'
+        And the OSM data
+            """
+            n11 v1 dV x1 y1
+            n12 v1 dV x2 y2
+            n13 v1 dV x3 y3
+            n14 v1 dV Tamenity=restaurant x4 y4
+            w20 v1 dV Thighway=primary Nn11,n12
+            w21 v1 dV Nn13,n14
+            w22 v1 dV Nn11,n12
+            r30 v1 dV Mn11@,w20@
+            r31 v1 dV Ttype=route Mw20@
+            """
+        When running osm2pgsql flex with parameters
+            | --slim |
+        Then table osm2pgsql_test_nodes contains exactly
+            | node_id | tagged | tags |
+            | 11      | False  | {} |
+            | 12      | False  | {} |
+            | 13      | False  | {} |
+            | 14      | True   | {'amenity': 'restaurant'} |
+
+        Then table osm2pgsql_test_ways contains exactly
+            | way_id | tagged | tags |
+            | 20     | True   | {'highway': 'primary'} |
+            | 21     | False  | {} |
+            | 22     | False  | {} |
+
+        Then table osm2pgsql_test_relations contains exactly
+            | relation_id | tagged | tags |
+            | 30          | False  | {} |
+            | 31          | True   | {'type': 'route'} |
+
+        Given the style file 'test_output_flex_untagged.lua'
+        And the OSM data
+            """
+            n11 v2 dV Tnatural=tree x1 y1
+            n14 v2 dV x4 y4
+            w21 v2 dV Nn14,n13
+            """
+        When running osm2pgsql flex with parameters
+            | --slim | -a |
+        Then table osm2pgsql_test_nodes contains exactly
+            | node_id | tagged | tags |
+            | 11      | True   | {'natural': 'tree'} |
+            | 12      | False  | {} |
+            | 13      | False  | {} |
+            | 14      | False  | {} |
+
+        Then table osm2pgsql_test_ways contains exactly
+            | way_id | tagged | tags |
+            | 20     | True   | {'highway': 'primary'} |
+            | 21     | False  | {} |
+            | 22     | False  | {} |
+
+        Then table osm2pgsql_test_relations contains exactly
+            | relation_id | tagged | tags |
+            | 30          | False  | {} |
+            | 31          | True   | {'type': 'route'} |
+

tests/data/test_output_flex_untagged.lua

@@ -0,0 +1,53 @@
+
+local tables = {}
+
+tables.nodes = osm2pgsql.define_node_table('osm2pgsql_test_nodes', {
+    { column = 'tags', type = 'jsonb' },
+    { column = 'tagged', type = 'bool' },
+    { column = 'geom', type = 'point', not_null = true },
+})
+
+tables.ways = osm2pgsql.define_way_table('osm2pgsql_test_ways', {
+    { column = 'tags', type = 'jsonb' },
+    { column = 'tagged', type = 'bool' },
+    { column = 'geom', type = 'linestring', not_null = true },
+})
+
+tables.relations = osm2pgsql.define_relation_table('osm2pgsql_test_relations', {
+    { column = 'tags', type = 'jsonb' },
+    { column = 'tagged', type = 'bool' },
+    { column = 'geom', type = 'geometry', not_null = true },
+})
+
+local function insert(dtable, object, tagged, geom)
+    tables[dtable]:insert({
+        tags = object.tags,
+        tagged = tagged,
+        geom = geom,
+    })
+end
+
+function osm2pgsql.process_node(object)
+    insert('nodes', object, true, object:as_point())
+end
+
+function osm2pgsql.process_way(object)
+    insert('ways', object, true, object:as_linestring())
+end
+
+function osm2pgsql.process_relation(object)
+    insert('relations', object, true, object:as_geometrycollection())
+end
+
+function osm2pgsql.process_untagged_node(object)
+    insert('nodes', object, false, object:as_point())
+end
+
+function osm2pgsql.process_untagged_way(object)
+    insert('ways', object, false, object:as_linestring())
+end
+
+function osm2pgsql.process_untagged_relation(object)
+    insert('relations', object, false, object:as_geometrycollection())
+end
+