From b2ac31de0a8f77781e242a003fbdd29d94599d94 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 13 Nov 2026 21:50:34 +0100
Subject: [PATCH] Construct progress_display_t object later

Do this as late as possible so that the start-up costs are not timed,
this way the display becomes more accurate.

This also changes the order of the arguments of some functions so that
they are consistent over the whole chain of calls.
---
 src/input.cpp | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index 7d12dd6f5..c99b3feb1 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -178,12 +178,10 @@ class queue_element_t
 class input_context_t
 {
 public:
-    input_context_t(osmdata_t *osmdata, progress_display_t *progress,
-                    bool append)
-    : m_osmdata(osmdata), m_progress(progress), m_append(append)
+    input_context_t(osmdata_t *osmdata, bool append, bool show_progress)
+    : m_osmdata(osmdata), m_progress(show_progress), m_append(append)
     {
         assert(osmdata);
-        assert(progress);
     }
 
     void apply(osmium::OSMObject *object)
@@ -196,16 +194,16 @@ class input_context_t
         if (m_last_type != object->type()) {
             if (m_last_type == osmium::item_type::node) {
                 m_osmdata->after_nodes();
-                m_progress->start_way_counter();
+                m_progress.start_way_counter();
             }
             if (object->type() == osmium::item_type::relation) {
                 m_osmdata->after_ways();
-                m_progress->start_relation_counter();
+                m_progress.start_relation_counter();
             }
             m_last_type = object->type();
         }
 
-        osmium::apply_item(*object, *m_osmdata, *m_progress);
+        osmium::apply_item(*object, *m_osmdata, m_progress);
     }
 
     void eof()
@@ -222,18 +220,18 @@ class input_context_t
         }
 
         m_osmdata->after_relations();
-        m_progress->print_summary();
+        m_progress.print_summary();
     }
 
 private:
     osmdata_t *m_osmdata;
-    progress_display_t *m_progress;
+    progress_display_t m_progress;
     osmium::item_type m_last_type = osmium::item_type::node;
     bool m_append;
 }; // class input_context_t
 
 file_info process_single_file(osmium::io::File const &file, osmdata_t *osmdata,
-                              progress_display_t *progress, bool append)
+                              bool append, bool show_progress)
 {
     file_info finfo;
 
@@ -241,7 +239,7 @@ file_info process_single_file(osmium::io::File const &file, osmdata_t *osmdata,
     finfo.header = reader.header();
     type_id last{osmium::item_type::node, 0};
 
-    input_context_t ctx{osmdata, progress, append};
+    input_context_t ctx{osmdata, append, show_progress};
     while (osmium::memory::Buffer buffer = reader.read()) {
         for (auto &object : buffer.select<osmium::OSMObject>()) {
             last = check_input(last, object);
@@ -259,8 +257,8 @@ file_info process_single_file(osmium::io::File const &file, osmdata_t *osmdata,
 }
 
 file_info process_multiple_files(std::vector<osmium::io::File> const &files,
-                                 osmdata_t *osmdata,
-                                 progress_display_t *progress, bool append)
+                                 osmdata_t *osmdata, bool append,
+                                 bool show_progress)
 {
     file_info finfo;
 
@@ -277,7 +275,7 @@ file_info process_multiple_files(std::vector<osmium::io::File> const &files,
         }
     }
 
-    input_context_t ctx{osmdata, progress, append};
+    input_context_t ctx{osmdata, append, show_progress};
     while (!queue.empty()) {
         auto element = queue.top();
         queue.pop();
@@ -340,11 +338,10 @@ file_info process_files(std::vector<osmium::io::File> const &files,
 {
     assert(osmdata);
 
-    progress_display_t progress{show_progress};
-
     if (files.size() == 1) {
-        return process_single_file(files.front(), osmdata, &progress, append);
+        return process_single_file(files.front(), osmdata, append,
+                                   show_progress);
     }
 
-    return process_multiple_files(files, osmdata, &progress, append);
+    return process_multiple_files(files, osmdata, append, show_progress);
 }