Refactor osmdata_t code

Remove has_pending() which checks two things we can easily check each by
itself and sometimes only need one or the other.

Turn get_pending_way_ids() and get_pending_relation_ids() into simple
getters, they are only needed for testing outside the class.

Author: joto

src/osmdata.cpp

@@ -383,9 +383,15 @@ void osmdata_t::process_dependents()
                                  m_num_procs};
 
     // stage 1b processing: process parents of changed objects
-    if (has_pending()) {
-        proc.process_ways(get_pending_way_ids());
-        proc.process_relations(get_pending_relation_ids());
+    if (!m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty()) {
+        if (!m_ways_pending_tracker.empty()) {
+            m_ways_pending_tracker.sort_unique();
+            proc.process_ways(std::move(m_ways_pending_tracker));
+        }
+        if (!m_rels_pending_tracker.empty()) {
+            m_rels_pending_tracker.sort_unique();
+            proc.process_relations(std::move(m_rels_pending_tracker));
+        }
         proc.merge_expire_trees();
     }
 
@@ -395,14 +401,16 @@ void osmdata_t::process_dependents()
         return;
     }
 
-    assert(m_rels_pending_tracker.empty());
-    m_mid->get_way_parents(marked_ways, &m_rels_pending_tracker);
-
     // process parent relations of marked ways
-    if (has_pending()) {
-        proc.process_relations_stage1c(
-            get_pending_relation_ids());
+    idlist_t rels_pending_tracker{};
+    m_mid->get_way_parents(marked_ways, &rels_pending_tracker);
+
+    if (rels_pending_tracker.empty()) {
+        return;
     }
+
+    rels_pending_tracker.sort_unique();
+    proc.process_relations_stage1c(std::move(rels_pending_tracker));
 }
 
 void osmdata_t::reprocess_marked() const { m_output->reprocess_marked(); }
@@ -442,26 +450,3 @@ void osmdata_t::stop()
 
     postprocess_database();
 }
-
-bool osmdata_t::has_pending() const noexcept
-{
-    return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
-}
-
-idlist_t osmdata_t::get_pending_way_ids()
-{
-    idlist_t list;
-    using std::swap;
-    swap(list, m_ways_pending_tracker);
-    list.sort_unique();
-    return list;
-}
-
-idlist_t osmdata_t::get_pending_relation_ids()
-{
-    idlist_t list;
-    using std::swap;
-    swap(list, m_rels_pending_tracker);
-    list.sort_unique();
-    return list;
-}

src/osmdata.hpp

@@ -58,11 +58,16 @@ class osmdata_t : public osmium::handler::Handler
      */
     void stop();
 
-    bool has_pending() const noexcept;
-
-    idlist_t get_pending_way_ids();
-
-    idlist_t get_pending_relation_ids();
+    // These getters are needed only for tests
+    idlist_t const &get_pending_way_ids() const noexcept
+    {
+        return m_ways_pending_tracker;
+    }
+
+    idlist_t const &get_pending_relation_ids() const noexcept
+    {
+        return m_rels_pending_tracker;
+    }
 
 private:
     /**

tests/test-middle.cpp

@@ -1065,7 +1065,8 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
         check_way(mid, way21);
         check_way_nodes(mid, way21.id(), {&node11, &node12});
 
-        REQUIRE_FALSE(osmdata.has_pending());
+        REQUIRE(osmdata.get_pending_way_ids().empty());
+        REQUIRE(osmdata.get_pending_relation_ids().empty());
 
         osmdata.stop();
     }
@@ -1088,10 +1089,11 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
         osmdata.after_ways();
         osmdata.after_relations();
 
-        REQUIRE(osmdata.has_pending());
-        idlist_t const way_ids = osmdata.get_pending_way_ids();
+        idlist_t const &way_ids = osmdata.get_pending_way_ids();
         REQUIRE(way_ids == idlist_t{20});
 
+        REQUIRE(osmdata.get_pending_relation_ids().empty());
+
         check_way(mid, way20);
         check_way_nodes(mid, way20.id(), {&node10a, &node11});
     }
@@ -1123,10 +1125,11 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             osmdata.after_ways();
             osmdata.after_relations();
 
-            REQUIRE(osmdata.has_pending());
-            idlist_t const way_ids = osmdata.get_pending_way_ids();
+            idlist_t const &way_ids = osmdata.get_pending_way_ids();
             REQUIRE(way_ids == idlist_t{20, 22});
 
+            REQUIRE(osmdata.get_pending_relation_ids().empty());
+
             check_way(mid, way20);
             check_way_nodes(mid, way20.id(), {&node10a, &node11});
             check_way(mid, way22);
@@ -1168,7 +1171,8 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             osmdata.after_ways();
             osmdata.after_relations();
 
-            REQUIRE_FALSE(osmdata.has_pending());
+            REQUIRE(osmdata.get_pending_way_ids().empty());
+            REQUIRE(osmdata.get_pending_relation_ids().empty());
         }
     }
 }
@@ -1237,10 +1241,10 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
         osmdata.after_ways();
         osmdata.after_relations();
 
-        REQUIRE(osmdata.has_pending());
-        idlist_t const rel_ids = osmdata.get_pending_relation_ids();
-
+        REQUIRE(osmdata.get_pending_way_ids().empty());
+        idlist_t const &rel_ids = osmdata.get_pending_relation_ids();
         REQUIRE(rel_ids == idlist_t{30});
+
         check_relation(mid, rel30);
     }
 
@@ -1259,10 +1263,9 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
         osmdata.after_ways();
         osmdata.after_relations();
 
-        REQUIRE(osmdata.has_pending());
-        idlist_t const way_ids = osmdata.get_pending_way_ids();
+        idlist_t const &way_ids = osmdata.get_pending_way_ids();
         REQUIRE(way_ids == idlist_t{20});
-        idlist_t const rel_ids = osmdata.get_pending_relation_ids();
+        idlist_t const &rel_ids = osmdata.get_pending_relation_ids();
         REQUIRE(rel_ids == idlist_t{31});
         check_relation(mid, rel31);
     }