Remove enqueue_ways() function from outputs

The function now does the same in all outputs except that it does
nothing in some outputs. The new member function
need_forward_dependencies() now just returns true or false and then the
code in osmdata.cpp can directly do what was in enqueue_ways() before.

Author: joto

src/osmdata.cpp

@@ -244,7 +244,10 @@ struct pending_threaded_processor : public middle_t::pending_processor
     void enqueue_ways(osmid_t id) override
     {
         for (size_t i = 0; i < outs.size(); ++i) {
-            outs[i]->enqueue_ways(queue, id, i, ids_queued);
+            if (outs[i]->need_forward_dependencies()) {
+                queue.emplace(id, i);
+                ++ids_queued;
+            }
         }
     }
 

src/output-flex.cpp

@@ -1002,13 +1002,6 @@ 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)
-{
-    job_queue.emplace(id, output_id);
-    ++added;
-}
-
 void output_flex_t::pending_way(osmid_t id, int exists)
 {
     if (!m_has_process_way) {

src/output-flex.hpp

@@ -61,8 +61,6 @@ class output_flex_t : public output_t
 
     void stage2_proc() override;
 
-    void enqueue_ways(pending_queue_t &job_queue, osmid_t id,
-                      std::size_t output_id, std::size_t &added) override;
     void pending_way(osmid_t id, int exists) override;
 
     void enqueue_relations(pending_queue_t &job_queue, osmid_t id,

src/output-gazetteer.hpp

@@ -46,7 +46,8 @@ class output_gazetteer_t : public output_t
     void stop(osmium::thread::Pool *) override {}
     void commit() override;
 
-    void enqueue_ways(pending_queue_t &, osmid_t, size_t, size_t &) override {}
+    bool need_forward_dependencies() const noexcept override { return false; }
+
     void pending_way(osmid_t, int) override {}
 
     void enqueue_relations(pending_queue_t &, osmid_t, size_t,

src/output-multi.cpp

@@ -70,13 +70,6 @@ bool output_multi_t::has_pending() const
     return !rels_pending_tracker.empty();
 }
 
-void output_multi_t::enqueue_ways(pending_queue_t &job_queue, osmid_t id,
-                                  size_t output_id, size_t &added)
-{
-    job_queue.emplace(id, output_id);
-    ++added;
-}
-
 void output_multi_t::pending_way(osmid_t id, int exists)
 {
     // Try to fetch the way from the DB

src/output-multi.hpp

@@ -46,8 +46,6 @@ class output_multi_t : public output_t
     void stop(osmium::thread::Pool *pool) override;
     void commit() override;
 
-    void enqueue_ways(pending_queue_t &job_queue, osmid_t id, size_t output_id,
-                      size_t &added) override;
     void pending_way(osmid_t id, int exists) override;
 
     void enqueue_relations(pending_queue_t &job_queue, osmid_t id,

src/output-null.hpp

@@ -22,9 +22,7 @@ class output_null_t : public output_t
     void commit() override {}
     void cleanup() {}
 
-    void enqueue_ways(pending_queue_t & /*job_queue*/, osmid_t /*id*/, size_t /*output_id*/,
-                      size_t & /*added*/) override
-    {}
+    bool need_forward_dependencies() const noexcept override { return false; }
 
     void pending_way(osmid_t /*id*/, int /*exists*/) override {}
 

src/output-pgsql.cpp

@@ -66,13 +66,6 @@ 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)
-{
-    job_queue.emplace(id, output_id);
-    ++added;
-}
-
 void output_pgsql_t::pending_way(osmid_t id, int exists)
 {
     // Try to fetch the way from the DB

src/output-pgsql.hpp

@@ -46,8 +46,6 @@ class output_pgsql_t : public output_t
     void stop(osmium::thread::Pool *pool) override;
     void commit() override;
 
-    void enqueue_ways(pending_queue_t &job_queue, osmid_t id, size_t output_id,
-                      size_t &added) override;
     void pending_way(osmid_t id, int exists) override;
 
     void enqueue_relations(pending_queue_t &job_queue, osmid_t id,

src/output.hpp

@@ -53,8 +53,8 @@ class output_t
 
     virtual void stage2_proc() {}
 
-    virtual void enqueue_ways(pending_queue_t &job_queue, osmid_t id,
-                              size_t output_id, size_t &added) = 0;
+    virtual bool need_forward_dependencies() const noexcept { return true; }
+
     virtual void pending_way(osmid_t id, int exists) = 0;
 
     virtual void enqueue_relations(pending_queue_t &job_queue, osmid_t id,