Introduce clean after_nodes/ways/relations() functions in handlers

Author: joto

src/input.cpp

@@ -204,6 +204,25 @@ prepare_input_files(std::vector<std::string> const &input_files,
     return files;
 }
 
+static void apply(osmium::OSMObject &object, osmdata_t &osmdata,
+                  progress_display_t &progress)
+{
+    static osmium::item_type last_type = osmium::item_type::node;
+
+    if (last_type != object.type()) {
+        if (last_type == osmium::item_type::node) {
+            osmdata.after_nodes();
+            progress.after_nodes();
+        } else if (last_type == osmium::item_type::way) {
+            osmdata.after_ways();
+            progress.after_ways();
+        }
+        last_type = object.type();
+    }
+
+    osmium::apply_item(object, osmdata, progress);
+}
+
 void process_file(osmium::io::File const &file, osmdata_t &osmdata,
                   progress_display_t &progress, bool append)
 {
@@ -218,11 +237,12 @@ void process_file(osmium::io::File const &file, osmdata_t &osmdata,
                     "Input file contains deleted objects but "
                     "you are not in append mode."};
             }
-            osmium::apply_item(object, osmdata, progress);
+            apply(object, osmdata, progress);
         }
     }
 
-    osmdata.flush();
+    osmdata.after_relations();
+    progress.after_relations();
 
     reader.close();
 }
@@ -258,7 +278,7 @@ void process_files(std::vector<osmium::io::File> const &files,
                     "Input file contains deleted objects but "
                     "you are not in append mode."};
             }
-            osmium::apply_item(element.object(), osmdata, progress);
+            apply(element.object(), osmdata, progress);
         }
 
         auto *source = element.data_source();
@@ -267,7 +287,8 @@ void process_files(std::vector<osmium::io::File> const &files,
         }
     }
 
-    osmdata.flush();
+    osmdata.after_relations();
+    progress.after_relations();
 
     for (auto &data_source : data_sources) {
         data_source.close();

src/osm2pgsql.cpp

@@ -37,9 +37,6 @@
 #include "util.hpp"
 #include "version.hpp"
 
-#include <osmium/io/file.hpp>
-
-#include <ctime>
 #include <exception>
 #include <memory>
 
@@ -91,7 +88,6 @@ int main(int argc, char *argv[])
         progress_display_t progress{get_logger().show_progress()};
         process_files(files, osmdata, progress, options.append);
 
-        progress.print_status(std::time(nullptr));
         fmt::print(stderr, "  parse time: {}\n",
                    util::human_readable_duration(timer_parse.stop()));
 

src/osmdata.cpp

@@ -71,13 +71,10 @@ void osmdata_t::node(osmium::Node const &node)
     }
 }
 
+void osmdata_t::after_nodes() { flush(); }
+
 void osmdata_t::way(osmium::Way &way)
 {
-    if (m_type != osmium::item_type::way) {
-        m_type = osmium::item_type::way;
-        flush();
-    }
-
     if (way.deleted()) {
         way_delete(way.id());
     } else {
@@ -89,13 +86,10 @@ void osmdata_t::way(osmium::Way &way)
     }
 }
 
+void osmdata_t::after_ways() { flush(); }
+
 void osmdata_t::relation(osmium::Relation const &rel)
 {
-    if (m_type != osmium::item_type::relation) {
-        m_type = osmium::item_type::relation;
-        flush();
-    }
-
     if (rel.deleted()) {
         relation_delete(rel.id());
     } else {
@@ -110,6 +104,8 @@ void osmdata_t::relation(osmium::Relation const &rel)
     }
 }
 
+void osmdata_t::after_relations() { flush(); }
+
 void osmdata_t::node_add(osmium::Node const &node) const
 {
     m_mid->node_set(node);

src/osmdata.hpp

@@ -43,7 +43,9 @@ class osmdata_t : public osmium::handler::Handler
     void way(osmium::Way &way);
     void relation(osmium::Relation const &rel);
 
-    void flush() const;
+    void after_nodes();
+    void after_ways();
+    void after_relations();
 
     /**
      * Rest of the processing (stages 1b, 1c, 2, and database postprocessing).
@@ -64,6 +66,8 @@ class osmdata_t : public osmium::handler::Handler
     void way_delete(osmid_t id) const;
     void relation_delete(osmid_t id) const;
 
+    void flush() const;
+
     /**
      * Run stage 1b and stage 1c processing: Process dependent objects in
      * append mode.
@@ -92,9 +96,6 @@ class osmdata_t : public osmium::handler::Handler
     // imported).
     osmium::Box m_bbox;
 
-    // Current type being parsed.
-    osmium::item_type m_type = osmium::item_type::node;
-
     int m_num_procs;
     bool m_append;
     bool m_droptemp;

src/progress-display.cpp

@@ -32,10 +32,8 @@ void progress_display_t::possibly_print_status()
 {
     std::time_t const now = std::time(nullptr);
 
-    if (m_last_print_time >= now) {
-        return;
+    if (m_last_print_time < now) {
+        m_last_print_time = now;
+        print_status(now);
     }
-    m_last_print_time = now;
-
-    print_status(now);
 }

src/progress-display.hpp

@@ -9,6 +9,7 @@
  * It contains the progress_display_t class.
  */
 
+#include <cstddef>
 #include <ctime>
 
 #include <osmium/handler.hpp>
@@ -32,18 +33,15 @@ class progress_display_t : public osmium::handler::Handler
         std::size_t add(osmid_t id) noexcept
         {
             max = id;
-            if (count == 0) {
-                start = std::time(nullptr);
-            }
             return ++count;
         }
     };
 
 public:
-    progress_display_t(bool enabled = false) noexcept : m_enabled(enabled) {}
-
-    void print_summary() const;
-    void print_status(std::time_t now) const;
+    progress_display_t(bool enabled = false) noexcept : m_enabled(enabled)
+    {
+        m_node.start = std::time(nullptr);
+    }
 
     void node(osmium::Node const &node)
     {
@@ -52,22 +50,31 @@ class progress_display_t : public osmium::handler::Handler
         }
     }
 
+    void after_nodes() { m_way.start = std::time(nullptr); }
+
     void way(osmium::Way const &way)
     {
         if (m_way.add(way.id()) % 1000 == 0) {
             possibly_print_status();
         }
     }
 
+    void after_ways() { m_rel.start = std::time(nullptr); }
+
     void relation(osmium::Relation const &relation)
     {
         if (m_rel.add(relation.id()) % 10 == 0) {
             possibly_print_status();
         }
     }
 
+    void after_relations() const { print_status(std::time(nullptr)); }
+
+    void print_summary() const;
+
 private:
     void possibly_print_status();
+    void print_status(std::time_t now) const;
 
     static double count_per_second(osmid_t count, uint64_t elapsed) noexcept
     {