Add options param to osmdata_t constructor

...instead of getting it from outputs

Author: joto

src/osm2pgsql.cpp

@@ -73,7 +73,8 @@ int main(int argc, char *argv[])
             need_dependencies ? new full_dependency_manager_t{middle}
                               : new dependency_manager_t{});
 
-        osmdata_t osmdata{std::move(dependency_manager), middle, outputs};
+        osmdata_t osmdata{std::move(dependency_manager), middle, outputs,
+                          options};
 
         fmt::print(stderr, "Using projection SRS {} ({})\n",
                    options.projection->target_srs(),

src/osmdata.cpp

@@ -13,23 +13,21 @@
 #include "db-copy.hpp"
 #include "format.hpp"
 #include "middle.hpp"
+#include "options.hpp"
 #include "osmdata.hpp"
 #include "output.hpp"
 #include "util.hpp"
 
 osmdata_t::osmdata_t(std::unique_ptr<dependency_manager_t> dependency_manager,
                      std::shared_ptr<middle_t> mid,
-                     std::vector<std::shared_ptr<output_t>> outs)
+                     std::vector<std::shared_ptr<output_t>> outs,
+                     options_t const &options)
 : m_dependency_manager(std::move(dependency_manager)), m_mid(std::move(mid)),
-  m_outs(std::move(outs))
+  m_outs(std::move(outs)), m_with_extra_attrs(options.extra_attributes)
 {
     assert(m_dependency_manager);
     assert(m_mid);
     assert(!m_outs.empty());
-
-    // Get the "extra_attributes" option from the first output. We expect
-    // all others to be the same.
-    m_with_extra_attrs = m_outs[0]->get_options()->extra_attributes;
 }
 
 /**

src/osmdata.hpp

@@ -7,6 +7,7 @@
 #include "dependency-manager.hpp"
 #include "osmtypes.hpp"
 
+class options_t;
 class output_t;
 struct middle_t;
 struct slim_middle_t;
@@ -16,7 +17,8 @@ class osmdata_t
 public:
     osmdata_t(std::unique_ptr<dependency_manager_t> dependency_manager,
               std::shared_ptr<middle_t> mid,
-              std::vector<std::shared_ptr<output_t>> outs);
+              std::vector<std::shared_ptr<output_t>> outs,
+              options_t const &options);
 
     void start() const;
     void flush() const;
@@ -40,6 +42,7 @@ class osmdata_t
     std::unique_ptr<dependency_manager_t> m_dependency_manager;
     std::shared_ptr<middle_t> m_mid;
     std::vector<std::shared_ptr<output_t>> m_outs;
+
     bool m_with_extra_attrs;
 };
 

tests/common-import.hpp

@@ -27,7 +27,7 @@ inline void parse_file(options_t const &options,
                        std::vector<std::shared_ptr<output_t>> const &outs,
                        char const *filename = nullptr)
 {
-    osmdata_t osmdata{std::move(dependency_manager), mid, outs};
+    osmdata_t osmdata{std::move(dependency_manager), mid, outs, options};
 
     osmdata.start();
     parse_osmium_t parser{options.bbox, options.append, &osmdata};
@@ -91,7 +91,8 @@ class import_t
             need_dependencies ? new full_dependency_manager_t{middle}
                               : new dependency_manager_t{});
 
-        osmdata_t osmdata{std::move(dependency_manager), middle, outputs};
+        osmdata_t osmdata{std::move(dependency_manager), middle, outputs,
+                          options};
 
         osmdata.start();