Merge pull request #1189 from joto/various-code-cleanups

Various code cleanups

Author: lonvia

src/options.cpp

@@ -304,6 +304,31 @@ options_t::options_t()
 
 options_t::~options_t() {}
 
+static osmium::Box parse_bbox(char const *bbox)
+{
+    double minx, maxx, miny, maxy;
+    int const n = sscanf(bbox, "%lf,%lf,%lf,%lf", &minx, &miny, &maxx, &maxy);
+    if (n != 4) {
+        throw std::runtime_error{"Bounding box must be specified like: "
+                                 "minlon,minlat,maxlon,maxlat\n"};
+    }
+
+    if (maxx <= minx) {
+        throw std::runtime_error{
+            "Bounding box failed due to maxlon <= minlon\n"};
+    }
+
+    if (maxy <= miny) {
+        throw std::runtime_error{
+            "Bounding box failed due to maxlat <= minlat\n"};
+    }
+
+    fmt::print(stderr, "Applying Bounding box: {},{} to {},{}\n", minx, miny,
+               maxx, maxy);
+
+    return osmium::Box{minx, miny, maxx, maxy};
+}
+
 options_t::options_t(int argc, char *argv[]) : options_t()
 {
     int c;
@@ -322,7 +347,7 @@ options_t::options_t(int argc, char *argv[]) : options_t()
             append = true;
             break;
         case 'b':
-            bbox = optarg;
+            bbox = parse_bbox(optarg);
             break;
         case 'c':
             create = true;

src/options.hpp

@@ -4,6 +4,8 @@
 #include "node-ram-cache.hpp"
 #include "reprojection.hpp"
 
+#include <osmium/osm/box.hpp>
+
 #include <boost/optional.hpp>
 #include <memory>
 #include <string>
@@ -120,7 +122,7 @@ struct options_t
     database_options_t database_options;
     std::string output_backend{"pgsql"};
     std::string input_reader{"auto"};
-    boost::optional<std::string> bbox{boost::none};
+    osmium::Box bbox;
     bool extra_attributes = false;
     bool verbose = false;
 

src/osm2pgsql.cpp

@@ -49,9 +49,9 @@ static std::shared_ptr<middle_t> create_middle(options_t const &options)
 
 int main(int argc, char *argv[])
 {
-    fmt::print(stderr, "osm2pgsql version {}\n\n", get_osm2pgsql_version());
-
     try {
+        fmt::print(stderr, "osm2pgsql version {}\n\n", get_osm2pgsql_version());
+
         options_t const options{argc, argv};
         if (options.long_usage_bool) {
             return 0;

src/osmdata.cpp

@@ -174,17 +174,13 @@ class multithreaded_processor
 public:
     using output_vec_t = std::vector<std::shared_ptr<output_t>>;
 
-    multithreaded_processor(std::shared_ptr<middle_t> const &mid,
+    multithreaded_processor(std::string const &conninfo,
+                            std::shared_ptr<middle_t> const &mid,
                             output_vec_t outs, size_t thread_count)
     : m_outputs(std::move(outs))
     {
         assert(!m_outputs.empty());
 
-        // The database connection info should be the same for all outputs,
-        // we take it arbitrarily from the first.
-        std::string const &conninfo =
-            m_outputs[0]->get_options()->database_options.conninfo();
-
         // For each thread we create clones of all the outputs.
         m_clones.resize(thread_count);
         for (size_t i = 0; i < thread_count; ++i) {
@@ -387,11 +383,12 @@ void osmdata_t::stop() const
     // 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{m_mid, m_outs,
-                                     (std::size_t)opts->num_procs};
+        multithreaded_processor proc{opts->database_options.conninfo(), m_mid,
+                                     m_outs, (std::size_t)opts->num_procs};
 
         proc.process_ways(m_dependency_manager->get_pending_way_ids());
-        proc.process_relations(m_dependency_manager->get_pending_relation_ids());
+        proc.process_relations(
+            m_dependency_manager->get_pending_relation_ids());
         proc.merge_expire_trees();
     }
 

src/parse-osmium.cpp

@@ -72,40 +72,10 @@ void parse_stats_t::possibly_print_status()
     print_status(now);
 }
 
-parse_osmium_t::parse_osmium_t(boost::optional<std::string> const &bbox,
-                               bool do_append, osmdata_t *osmdata)
-: m_data(osmdata), m_append(do_append)
-{
-    if (bbox) {
-        m_bbox = parse_bbox(bbox);
-    }
-}
-
-osmium::Box parse_osmium_t::parse_bbox(boost::optional<std::string> const &bbox)
-{
-    double minx, maxx, miny, maxy;
-    int const n =
-        sscanf(bbox->c_str(), "%lf,%lf,%lf,%lf", &minx, &miny, &maxx, &maxy);
-    if (n != 4) {
-        throw std::runtime_error{"Bounding box must be specified like: "
-                                 "minlon,minlat,maxlon,maxlat\n"};
-    }
-
-    if (maxx <= minx) {
-        throw std::runtime_error{
-            "Bounding box failed due to maxlon <= minlon\n"};
-    }
-
-    if (maxy <= miny) {
-        throw std::runtime_error{
-            "Bounding box failed due to maxlat <= minlat\n"};
-    }
-
-    fmt::print(stderr, "Applying Bounding box: {},{} to {},{}\n", minx, miny,
-               maxx, maxy);
-
-    return osmium::Box(minx, miny, maxx, maxy);
-}
+parse_osmium_t::parse_osmium_t(osmium::Box const &bbox, bool append,
+                               osmdata_t *osmdata)
+: m_data(osmdata), m_bbox(bbox), m_append(append)
+{}
 
 void parse_osmium_t::stream_file(std::string const &filename,
                                  std::string const &fmt)
@@ -162,7 +132,7 @@ void parse_osmium_t::node(osmium::Node const &node)
             return;
         }
 
-        if (!m_bbox || m_bbox->contains(node.location())) {
+        if (!m_bbox.valid() || m_bbox.contains(node.location())) {
             if (m_append) {
                 m_data->node_modify(node);
             } else {

src/parse-osmium.hpp

@@ -1,7 +1,6 @@
 #ifndef OSM2PGSQL_PARSE_OSMIUM_HPP
 #define OSM2PGSQL_PARSE_OSMIUM_HPP
 
-#include <boost/optional.hpp>
 #include <ctime>
 
 #include "osmtypes.hpp"
@@ -131,8 +130,7 @@ class parse_stats_t
 class parse_osmium_t : public osmium::handler::Handler
 {
 public:
-    parse_osmium_t(boost::optional<std::string> const &bbox, bool do_append,
-                   osmdata_t *osmdata);
+    parse_osmium_t(osmium::Box const &bbox, bool append, osmdata_t *osmdata);
 
     void stream_file(std::string const &filename, std::string const &fmt);
 
@@ -143,14 +141,18 @@ class parse_osmium_t : public osmium::handler::Handler
     parse_stats_t const &stats() const noexcept { return m_stats; }
 
 private:
-    osmium::Box parse_bbox(boost::optional<std::string> const &bbox);
-
     osmdata_t *m_data;
-    bool m_append;
-    boost::optional<osmium::Box> m_bbox;
+
+    // Bounding box for node import or invalid Box if everything is imported
+    osmium::Box m_bbox;
+
     parse_stats_t m_stats;
+
     // Current type being parsed.
-    osmium::item_type m_type;
+    osmium::item_type m_type = osmium::item_type::undefined;
+
+    // Are we running in append mode?
+    bool m_append;
 };
 
 #endif // OSM2PGSQL_PARSE_OSMIUM_HPP