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

The change in bc87ea2 did not handle
untagged ways/relations correctly in stages 1c and 2. The normal
process_* Lua callback was called for untagged objects instead of the
new process_untagged_* callback. This commit fixes that.

Author: joto

src/output-flex.cpp

@@ -835,17 +835,12 @@ void output_flex_t::get_mutex_and_call_lua_function(
 
 void output_flex_t::pending_way(osmid_t id)
 {
-    if (!m_process_way) {
-        return;
-    }
-
     if (!m_way_cache.init(middle(), id)) {
         return;
     }
 
     way_delete(id);
-
-    get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
+    process_way();
 }
 
 void output_flex_t::select_relation_members()
@@ -892,9 +887,33 @@ void output_flex_t::select_relation_members(osmid_t id)
     select_relation_members();
 }
 
+void output_flex_t::process_way()
+{
+    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(func, m_way_cache.get());
+}
+
+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 +923,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 +937,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;
 }
 
@@ -1459,9 +1474,7 @@ void output_flex_t::reprocess_marked()
             continue;
         }
         way_delete(id);
-        if (m_process_way) {
-            get_mutex_and_call_lua_function(m_process_way, m_way_cache.get());
-        }
+        process_way();
     }
 
     // We don't need these any more so can free the memory.

src/output-flex.hpp

@@ -196,6 +196,9 @@ 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_way();
+    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,