Merge pull request #1192 from joto/get-options-into-osmdata

Get options into osmdata

Author: lonvia

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,24 @@
 #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_conninfo(options.database_options.conninfo()),
+  m_num_procs(options.num_procs), m_append(options.append),
+  m_droptemp(options.droptemp), m_parallel_indexing(options.parallel_indexing),
+  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;
 }
 
 /**
@@ -377,14 +378,11 @@ void osmdata_t::stop() const
         out->sync();
     }
 
-    // should be the same for all outputs
-    auto const *opts = m_outs[0]->get_options();
-
     // In append mode there might be dependent objects pending that we
     // need to process.
-    if (opts->append && m_dependency_manager->has_pending()) {
-        multithreaded_processor proc{opts->database_options.conninfo(), m_mid,
-                                     m_outs, (std::size_t)opts->num_procs};
+    if (m_append && m_dependency_manager->has_pending()) {
+        multithreaded_processor proc{m_conninfo, m_mid, m_outs,
+                                     (std::size_t)m_num_procs};
 
         proc.process_ways(m_dependency_manager->get_pending_way_ids());
         proc.process_relations(
@@ -399,10 +397,9 @@ void osmdata_t::stop() const
     // Clustering, index creation, and cleanup.
     // All the intensive parts of this are long-running PostgreSQL commands
     {
-        osmium::thread::Pool pool{opts->parallel_indexing ? opts->num_procs : 1,
-                                  512};
+        osmium::thread::Pool pool{m_parallel_indexing ? m_num_procs : 1, 512};
 
-        if (opts->droptemp) {
+        if (m_droptemp) {
             // When dropping middle tables, make sure they are gone before
             // indexing starts.
             m_mid->stop(pool);
@@ -412,7 +409,7 @@ void osmdata_t::stop() const
             out->stop(&pool);
         }
 
-        if (!opts->droptemp) {
+        if (!m_droptemp) {
             // When keeping middle tables, there is quite a large index created
             // which is better done after the output tables have been copied.
             // Note that --disable-parallel-indexing needs to be used to really

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,7 +42,14 @@ 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;
+
+    std::string m_conninfo;
+    int m_num_procs;
+    bool m_append;
+    bool m_droptemp;
+    bool m_parallel_indexing;
     bool m_with_extra_attrs;
+
 };
 
 #endif // OSM2PGSQL_OSMDATA_HPP

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();