Simplify enqueue_ways handling

Author: joto

src/middle-pgsql.cpp

@@ -445,8 +445,6 @@ void middle_pgsql_t::iterate_ways(middle_t::pending_processor &pf)
     while (id_tracker::is_valid(id = m_ways_pending_tracker->pop_mark())) {
         pf.enqueue_ways(id);
     }
-    // in case we had higher ones than the middle
-    pf.enqueue_ways(id_tracker::max());
 
     //let the threads work on them
     pf.process_ways();

src/output-flex.cpp

@@ -1005,10 +1005,8 @@ void output_flex_t::call_process_function(int index,
 void output_flex_t::enqueue_ways(pending_queue_t &job_queue, osmid_t id,
                                  std::size_t output_id, std::size_t &added)
 {
-    if (id_tracker::is_valid(id)) {
-        job_queue.emplace(id, output_id);
-        ++added;
-    }
+    job_queue.emplace(id, output_id);
+    ++added;
 }
 
 void output_flex_t::pending_way(osmid_t id, int exists)

src/output-multi.cpp

@@ -73,10 +73,8 @@ bool output_multi_t::has_pending() const
 void output_multi_t::enqueue_ways(pending_queue_t &job_queue, osmid_t id,
                                   size_t output_id, size_t &added)
 {
-    if (id_tracker::is_valid(id)) {
-        job_queue.emplace(id, output_id);
-        ++added;
-    }
+    job_queue.emplace(id, output_id);
+    ++added;
 }
 
 void output_multi_t::pending_way(osmid_t id, int exists)

src/output-pgsql.cpp

@@ -69,10 +69,8 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
 void output_pgsql_t::enqueue_ways(pending_queue_t &job_queue, osmid_t id,
                                   size_t output_id, size_t &added)
 {
-    if (id_tracker::is_valid(id)) {
-        job_queue.emplace(id, output_id);
-        ++added;
-    }
+    job_queue.emplace(id, output_id);
+    ++added;
 }
 
 void output_pgsql_t::pending_way(osmid_t id, int exists)

tests/test-middle.cpp

@@ -1018,12 +1018,6 @@ class test_pending_processor : public middle_t::pending_processor
 
     void check_way_ids_equal_to(std::initializer_list<osmid_t> list) noexcept
     {
-        REQUIRE(!m_way_ids.empty());
-
-        // The last tracked id is always the invalid id, which we ignore
-        REQUIRE_FALSE(id_tracker::is_valid(m_way_ids.back()));
-        m_way_ids.pop_back();
-
         REQUIRE(m_way_ids.size() == list.size());
         REQUIRE(std::equal(m_way_ids.cbegin(), m_way_ids.cend(), list.begin()));
     }