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

When we introduced the "untagged" callbacks in
bc87ea2, we did not call the
process_untagged_way/relation callbacks for untagged ways/relations  in
stage 1b and 1c, but called the normal process_way/relation callbacks.
That's not correct. So this is changed in this commit.

For stage2 processing the answer which callback to call is a bit more
complicated: On first glance we should also call the "untagged" function
for untagged objects. But if we call the "untagged" function in that
case, we would have to implement that function and it would be called
for the millions of untagged objects we are not interested in. So it is
arguably better to call the normal processing functions here. After all
we explicitly requested the processing function to be called with the
select_relation_members() call. So we are keeping this behaviour.

Author: joto

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,13 @@ void output_flex_t::pending_way(osmid_t id)
     }
 
     way_delete(id);
+    auto const &func = m_way_cache.get().tags().empty() ? m_process_untagged_way
+                                                        : m_process_way;
+    if (!func) {
+        return;
+    }
 
-    get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
+    get_mutex_and_call_lua_function(func, m_way_cache.get());
 }
 
 void output_flex_t::select_relation_members()
@@ -892,9 +897,22 @@ 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) {
+        return;
+    }
+
+    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 +922,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 +936,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,