Merge pull request #2045 from joto/small-cleanups

Various small code cleanups

Author: lonvia

src/output-pgsql.cpp

@@ -352,12 +352,12 @@ void output_pgsql_t::delete_from_output_and_expire(osmid_t id)
 
     for (auto table : {t_line, t_poly}) {
         if (m_expire.enabled()) {
-            auto const results = m_tables[table]->get_wkb(id);
+            auto const results = m_tables.at(table)->get_wkb(id);
             if (expire_from_result(&m_expire, results, m_expire_config) != 0) {
-                m_tables[table]->delete_row(id);
+                m_tables.at(table)->delete_row(id);
             }
         } else {
-            m_tables[table]->delete_row(id);
+            m_tables.at(table)->delete_row(id);
         }
     }
 }
@@ -485,7 +485,7 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
             std::abort(); // should never be here
         }
 
-        m_tables[i] = std::make_unique<table_t>(
+        m_tables.at(i) = std::make_unique<table_t>(
             name, type, columns, options.hstore_columns,
             options.projection->target_srs(), options.append,
             options.hstore_mode, copy_thread, options.output_dbschema);
@@ -504,8 +504,8 @@ output_pgsql_t::output_pgsql_t(
 {
     for (std::size_t i = 0; i < m_tables.size(); ++i) {
         //copy constructor will just connect to the already there table
-        m_tables[i] =
-            std::make_unique<table_t>(*(other->m_tables[i]), copy_thread);
+        m_tables.at(i) =
+            std::make_unique<table_t>(*(other->m_tables.at(i)), copy_thread);
     }
 }
 

src/table.hpp

@@ -55,8 +55,6 @@ class table_t
 
     pg_result_t get_wkb(osmid_t id);
 
-    task_result_t m_task_result;
-
 private:
     void connect();
     void prepare();
@@ -81,6 +79,7 @@ class table_t
     columns_t m_columns;
     hstores_t m_hstore_columns;
     std::string m_table_space;
+    task_result_t m_task_result;
 
     db_copy_mgr_t<db_deleter_by_id_t> m_copy;
 };

src/tagtransform-c.cpp

@@ -7,6 +7,7 @@
  * For a full list of authors see the git log.
  */
 
+#include <array>
 #include <cstdlib>
 #include <cstring>
 
@@ -18,27 +19,30 @@
 
 namespace {
 
-const struct
+struct layers_type
 {
     char const *highway;
     int offset;
     bool roads;
-} layers[] = {{"proposed", 1, false},       {"construction", 2, false},
-              {"steps", 10, false},         {"cycleway", 10, false},
-              {"bridleway", 10, false},     {"footway", 10, false},
-              {"path", 10, false},          {"track", 11, false},
-              {"service", 15, false},
-
-              {"tertiary_link", 24, false}, {"secondary_link", 25, true},
-              {"primary_link", 27, true},   {"trunk_link", 28, true},
-              {"motorway_link", 29, true},
-
-              {"raceway", 30, false},       {"pedestrian", 31, false},
-              {"living_street", 32, false}, {"road", 33, false},
-              {"unclassified", 33, false},  {"residential", 33, false},
-              {"tertiary", 34, false},      {"secondary", 36, true},
-              {"primary", 37, true},        {"trunk", 38, true},
-              {"motorway", 39, true}};
+};
+
+constexpr std::array<layers_type, 25> const layers = {
+    {{"proposed", 1, false},       {"construction", 2, false},
+     {"steps", 10, false},         {"cycleway", 10, false},
+     {"bridleway", 10, false},     {"footway", 10, false},
+     {"path", 10, false},          {"track", 11, false},
+     {"service", 15, false},
+
+     {"tertiary_link", 24, false}, {"secondary_link", 25, true},
+     {"primary_link", 27, true},   {"trunk_link", 28, true},
+     {"motorway_link", 29, true},
+
+     {"raceway", 30, false},       {"pedestrian", 31, false},
+     {"living_street", 32, false}, {"road", 33, false},
+     {"unclassified", 33, false},  {"residential", 33, false},
+     {"tertiary", 34, false},      {"secondary", 36, true},
+     {"primary", 37, true},        {"trunk", 38, true},
+     {"motorway", 39, true}}};
 
 } // anonymous namespace
 

tests/common-import.hpp

@@ -70,7 +70,7 @@ class data_t
     data_t() = default;
 
     template <typename CONTAINER>
-    data_t(CONTAINER const &objects)
+    explicit data_t(CONTAINER const &objects)
     {
         std::copy(std::begin(objects), std::end(objects),
                   std::back_inserter(m_objects));
@@ -167,7 +167,8 @@ class import_t
     void run_import(options_t options, char const *data,
                     std::string const &format = "opl")
     {
-        run_import(options, std::initializer_list<std::string>{data}, format);
+        run_import(std::move(options), std::initializer_list<std::string>{data},
+                   format);
     }
 
     void run_file(options_t options, char const *file = nullptr)
@@ -195,7 +196,7 @@ class import_t
 
     testing::pg::conn_t connect() { return m_db.connect(); }
 
-    testing::pg::tempdb_t const &db() const { return m_db; }
+    testing::pg::tempdb_t const &db() const noexcept { return m_db; }
 
 private:
     testing::pg::tempdb_t m_db;

tests/test-output-pgsql-z_order.cpp

@@ -33,7 +33,7 @@ TEST_CASE("compute Z order")
                                      " ORDER BY z_order DESC"
                                      " LIMIT 1 OFFSET {}",
                                      i);
-        REQUIRE(expected[i] == conn.result_as_string(sql));
+        REQUIRE(expected.at(i) == conn.result_as_string(sql));
     }
 
     REQUIRE("residential" ==