Move indirect dependency tracking into middle

Move dependency tracking of relations referencing ways referencing nodes
from outputs into middle.

Author: joto

src/middle-pgsql.cpp

@@ -321,19 +321,29 @@ void middle_pgsql_t::node_changed(osmid_t osm_id)
         return;
     }
 
-    //keep track of whatever ways and rels these nodes intersect
+    idlist_t way_ids;
+
+    // Find all ways referencing this node and mark them as pending.
     auto res = exec_prepared("mark_ways_by_node", osm_id);
+    way_ids.reserve(res.num_tuples());
     for (int i = 0; i < res.num_tuples(); ++i) {
         osmid_t const marked = osmium::string_to_object_id(res.get_value(i, 0));
         m_ways_pending_tracker->mark(marked);
+        way_ids.push_back(marked);
     }
 
-    //do the rels too
+    // Find all relations referencing this node and mark them as pending.
     res = exec_prepared("mark_rels_by_node", osm_id);
     for (int i = 0; i < res.num_tuples(); ++i) {
         osmid_t const marked = osmium::string_to_object_id(res.get_value(i, 0));
         m_rels_pending_tracker->mark(marked);
     }
+
+    // For all ways referencing this node, mark relations referencing them
+    // as pending.
+    for (auto const way_id : way_ids) {
+        way_changed(way_id);
+    }
 }
 
 void middle_pgsql_t::way_set(osmium::Way const &way)

src/output-flex.cpp

@@ -1020,10 +1020,6 @@ void output_flex_t::pending_way(osmid_t id, int exists)
 
     if (exists) {
         way_delete(id);
-        auto const rel_ids = m_mid->relations_using_way(id);
-        for (auto const rel_id : rel_ids) {
-            m_rels_pending_tracker.mark(rel_id);
-        }
     }
 
     auto &way = m_buffer.get<osmium::Way>(0);

src/output-multi.cpp

@@ -250,10 +250,6 @@ void output_multi_t::reprocess_way(osmium::Way *way, bool exists)
     if (m_processor->interests(geometry_processor::interest_relation) &&
         exists) {
         way_delete(way->id());
-        auto const rel_ids = m_mid->relations_using_way(way->id());
-        for (auto const rel_id : rel_ids) {
-            rels_pending_tracker.mark(rel_id);
-        }
     }
 
     //check if we are keeping this way

src/output-pgsql.cpp

@@ -74,13 +74,6 @@ void output_pgsql_t::pending_way(osmid_t id, int exists)
         /* If the flag says this object may exist already, delete it first */
         if (exists) {
             pgsql_delete_way_from_output(id);
-            // TODO: this now only has an effect when called from the iterate_ways
-            // call-back, so we need some alternative way to trigger this within
-            // osmdata_t.
-            idlist_t const rel_ids = m_mid->relations_using_way(id);
-            for (auto &mid : rel_ids) {
-                rels_pending_tracker.mark(mid);
-            }
         }
 
         taglist_t outtags;