Merge pull request #1163 from joto/cleanup-gazetteer

lonvia · web-flow · commit 0f5b7b624f9c · 2020-05-10T14:20:26.000+02:00
Various cleanups in gazetteer code
diff --git a/src/gazetteer-style.cpp b/src/gazetteer-style.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <cstring>
+#include <stdexcept>
 
 #include <boost/property_tree/json_parser.hpp>
 #include <osmium/osm.hpp>
@@ -85,9 +86,9 @@ void gazetteer_style_t::load_style(std::string const &filename)
 
     pt::read_json(filename, root);
 
-    for (auto &entry : root) {
-        for (auto &tag : entry.second.get_child("keys")) {
-            for (auto &value : entry.second.get_child("values")) {
+    for (auto const &entry : root) {
+        for (auto const &tag : entry.second.get_child("keys")) {
+            for (auto const &value : entry.second.get_child("values")) {
                 add_style_entry(tag.second.data(), value.first,
                                 parse_flags(value.second.data()));
             }
@@ -102,7 +103,7 @@ gazetteer_style_t::flag_t gazetteer_style_t::parse_flags(std::string const &str)
     std::string::size_type start = 0;
 
     while (start != std::string::npos) {
-        auto end = str.find(',', start);
+        auto const end = str.find(',', start);
 
         std::string item;
 
@@ -236,40 +237,42 @@ void gazetteer_style_t::add_style_entry(std::string const &key,
 gazetteer_style_t::flag_t gazetteer_style_t::find_flag(char const *k,
                                                        char const *v) const
 {
-    auto klen = std::strlen(k);
-    auto vlen = std::strlen(v);
+    auto const klen = std::strlen(k);
+    auto const vlen = std::strlen(v);
 
     // full match
-    auto fulllen = klen + vlen + 1U;
+    auto const fulllen = klen + vlen + 1U;
     for (auto const &e : m_matcher) {
         switch (e.type) {
         case matcher_t::MT_FULL:
             if (e.name.size() == fulllen &&
                 std::strcmp(k, e.name.c_str()) == 0 &&
-                memcmp(v, e.name.data() + klen + 1, vlen) == 0) {
+                std::memcmp(v, e.name.data() + klen + 1, vlen) == 0) {
                 return e.flag;
             }
             break;
         case matcher_t::MT_KEY:
-            if (e.name.size() == klen && memcmp(k, e.name.data(), klen) == 0) {
+            if (e.name.size() == klen &&
+                std::memcmp(k, e.name.data(), klen) == 0) {
                 return e.flag;
             }
             break;
         case matcher_t::MT_PREFIX:
             if (e.name.size() < klen &&
-                memcmp(k, e.name.data(), e.name.size()) == 0) {
+                std::memcmp(k, e.name.data(), e.name.size()) == 0) {
                 return e.flag;
             }
             break;
         case matcher_t::MT_SUFFIX:
             if (e.name.size() < klen &&
-                memcmp(k + klen - e.name.size(), e.name.data(),
-                       e.name.size()) == 0) {
+                std::memcmp(k + klen - e.name.size(), e.name.data(),
+                            e.name.size()) == 0) {
                 return e.flag;
             }
             break;
         case matcher_t::MT_VALUE:
-            if (e.name.size() == vlen && memcmp(v, e.name.data(), vlen) == 0) {
+            if (e.name.size() == vlen &&
+                std::memcmp(v, e.name.data(), vlen) == 0) {
                 return e.flag;
             }
             break;
@@ -294,11 +297,11 @@ void gazetteer_style_t::process_tags(osmium::OSMObject const &o)
     bool is_named = false;
 
     for (auto const &item : o.tags()) {
-        char const *k = item.key();
-        char const *v = item.value();
+        char const *const k = item.key();
+        char const *const v = item.value();
 
         if (std::strcmp(k, "admin_level") == 0) {
-            m_admin_level = atoi(v);
+            m_admin_level = std::atoi(v);
             if (m_admin_level <= 0 || m_admin_level > MAX_ADMINLEVEL) {
                 m_admin_level = MAX_ADMINLEVEL;
             }
@@ -309,7 +312,7 @@ void gazetteer_style_t::process_tags(osmium::OSMObject const &o)
             m_operator = v;
         }
 
-        flag_t flag = find_flag(k, v);
+        flag_t const flag = find_flag(k, v);
 
         if (flag == 0) {
             continue;
@@ -348,7 +351,7 @@ void gazetteer_style_t::process_tags(osmium::OSMObject const &o)
             // country and postcode are handled specially, ignore them here
             if (std::strcmp(addr_key, "country") != 0 &&
                 std::strcmp(addr_key, "postcode") != 0) {
-                bool first = std::none_of(
+                bool const first = std::none_of(
                     m_address.begin(), m_address.end(), [&](ptag_t const &t) {
                         return std::strcmp(t.first, addr_key) == 0;
                     });
@@ -413,7 +416,7 @@ void gazetteer_style_t::filter_main_tags(bool is_named,
     // first throw away unnamed mains
     auto mend =
         std::remove_if(m_main.begin(), m_main.end(), [&](pmaintag_t const &t) {
-            auto flags = std::get<2>(t);
+            auto const flags = std::get<2>(t);
 
             if (flags & SF_MAIN_NAMED) {
                 return !is_named;
@@ -468,7 +471,7 @@ void gazetteer_style_t::copy_out(osmium::OSMObject const &o,
             DomainMatcher m{std::get<0>(tag)};
             buffer.new_hash();
             for (auto const &t : o.tags()) {
-                char const *k = m(t);
+                char const *const k = m(t);
                 if (k) {
                     buffer.add_hash_elem(k, t.value());
                 }
@@ -507,9 +510,10 @@ void gazetteer_style_t::copy_out(osmium::OSMObject const &o,
             for (auto const &a : m_address) {
                 if (std::strcmp(a.first, "tiger:county") == 0) {
                     std::string term;
-                    auto *end = strchr(a.second, ',');
+                    auto const *const end = std::strchr(a.second, ',');
                     if (end) {
-                        auto len = (std::string::size_type)(end - a.second);
+                        auto const len =
+                            (std::string::size_type)(end - a.second);
                         term = std::string(a.second, len);
                     } else {
                         term = a.second;
diff --git a/src/gazetteer-style.hpp b/src/gazetteer-style.hpp
@@ -139,7 +139,7 @@ class gazetteer_style_t
                   copy_mgr_t &buffer) const;
     std::string class_list() const;
 
-    bool has_data() const { return !m_main.empty(); }
+    bool has_data() const noexcept { return !m_main.empty(); }
 
 private:
     bool add_metadata_style_entry(std::string const &key);
diff --git a/src/output-gazetteer.cpp b/src/output-gazetteer.cpp
@@ -1,5 +1,3 @@
-#include <libpq-fe.h>
-
 #include "format.hpp"
 #include "middle.hpp"
 #include "options.hpp"
@@ -10,8 +8,8 @@
 #include "wkb.hpp"
 
 #include <cstring>
-#include <iostream>
 #include <memory>
+#include <string>
 
 void output_gazetteer_t::delete_unused_classes(char osm_type, osmid_t osm_id)
 {
@@ -20,7 +18,7 @@ void output_gazetteer_t::delete_unused_classes(char osm_type, osmid_t osm_id)
 
         assert(m_style.has_data());
 
-        std::string cls = m_style.class_list();
+        std::string const cls = m_style.class_list();
         m_copy.delete_object(osm_type, osm_id, cls);
     }
 }
@@ -35,18 +33,18 @@ void output_gazetteer_t::delete_unused_full(char osm_type, osmid_t osm_id)
 
 void output_gazetteer_t::start()
 {
-    int srid = m_options.projection->target_srs();
-
     /* (Re)create the table unless we are appending */
     if (!m_options.append) {
+        int const srid = m_options.projection->target_srs();
+
         pg_conn_t conn{m_options.database_options.conninfo()};
 
         /* Drop any existing table */
         conn.exec("DROP TABLE IF EXISTS place CASCADE");
 
         /* Create the new table */
 
-        std::string sql =
+        std::string const sql =
             "CREATE TABLE place ("
             "  osm_id int8 NOT NULL,"
             "  osm_type char(1) NOT NULL,"
@@ -56,15 +54,14 @@ void output_gazetteer_t::start()
             "  admin_level smallint,"
             "  address hstore,"
             "  extratags hstore," +
-            "  geometry Geometry(Geometry,{}) NOT NULL"_format(srid) + ")";
-
-        sql += tablespace_clause(m_options.tblsmain_data);
+            "  geometry Geometry(Geometry,{}) NOT NULL"_format(srid) + ")" +
+            tablespace_clause(m_options.tblsmain_data);
 
         conn.exec(sql);
 
         std::string const index_sql =
-            "CREATE INDEX place_id_idx ON place "
-            "USING BTREE (osm_type, osm_id)" +
+            "CREATE INDEX place_id_idx ON place"
+            " USING BTREE (osm_type, osm_id)" +
             tablespace_clause(m_options.tblsmain_index);
         conn.exec(index_sql);
     }
@@ -95,7 +92,7 @@ bool output_gazetteer_t::process_node(osmium::Node const &node)
         return false;
     }
 
-    auto wkb = m_builder.get_wkb_node(node.location());
+    auto const wkb = m_builder.get_wkb_node(node.location());
     delete_unused_classes('N', node.id());
     m_style.copy_out(node, wkb, m_copy);
 
@@ -133,7 +130,7 @@ bool output_gazetteer_t::process_way(osmium::Way *way)
         geom = m_builder.get_wkb_polygon(*way);
     }
     if (geom.empty()) {
-        auto wkbs = m_builder.get_wkb_line(way->nodes(), 0.0);
+        auto const wkbs = m_builder.get_wkb_line(way->nodes(), 0.0);
         if (wkbs.empty()) {
             return false;
         }
@@ -163,8 +160,7 @@ void output_gazetteer_t::relation_modify(osmium::Relation const &rel)
 
 bool output_gazetteer_t::process_relation(osmium::Relation const &rel)
 {
-    auto const &tags = rel.tags();
-    char const *type = tags["type"];
+    char const *const type = rel.tags()["type"];
     if (!type) {
         return false;
     }
@@ -185,20 +181,22 @@ bool output_gazetteer_t::process_relation(osmium::Relation const &rel)
     }
 
     /* get the boundary path (ways) */
-    osmium_buffer.clear();
-    auto num_ways = m_mid->rel_way_members_get(rel, nullptr, osmium_buffer);
+    m_osmium_buffer.clear();
+    auto const num_ways =
+        m_mid->rel_way_members_get(rel, nullptr, m_osmium_buffer);
 
     if (num_ways == 0) {
         return false;
     }
 
-    for (auto &w : osmium_buffer.select<osmium::Way>()) {
+    for (auto &w : m_osmium_buffer.select<osmium::Way>()) {
         m_mid->nodes_get_list(&(w.nodes()));
     }
 
-    auto geoms = is_waterway
-                     ? m_builder.get_wkb_multiline(osmium_buffer, 0.0)
-                     : m_builder.get_wkb_multipolygon(rel, osmium_buffer, true);
+    auto const geoms =
+        is_waterway
+            ? m_builder.get_wkb_multiline(m_osmium_buffer, 0.0)
+            : m_builder.get_wkb_multipolygon(rel, m_osmium_buffer, true);
 
     if (geoms.empty()) {
         return false;
diff --git a/src/output-gazetteer.hpp b/src/output-gazetteer.hpp
@@ -2,7 +2,6 @@
 #define OSM2PGSQL_OUTPUT_GAZETTEER_HPP
 
 #include <memory>
-#include <string>
 
 #include <osmium/memory/buffer.hpp>
 
@@ -20,7 +19,7 @@ class output_gazetteer_t : public output_t
                        std::shared_ptr<db_copy_thread_t> const &copy_thread)
     : output_t(cloned_mid, other->m_options), m_copy(copy_thread),
       m_builder(other->m_options.projection),
-      osmium_buffer(PLACE_BUFFER_SIZE, osmium::memory::Buffer::auto_grow::yes)
+      m_osmium_buffer(PLACE_BUFFER_SIZE, osmium::memory::Buffer::auto_grow::yes)
     {}
 
 public:
@@ -29,7 +28,7 @@ class output_gazetteer_t : public output_t
                        std::shared_ptr<db_copy_thread_t> const &copy_thread)
     : output_t(mid, options), m_copy(copy_thread),
       m_builder(options.projection),
-      osmium_buffer(PLACE_BUFFER_SIZE, osmium::memory::Buffer::auto_grow::yes)
+      m_osmium_buffer(PLACE_BUFFER_SIZE, osmium::memory::Buffer::auto_grow::yes)
     {
         m_style.load_style(options.style);
     }
@@ -43,13 +42,13 @@ class output_gazetteer_t : public output_t
     }
 
     void start() override;
-    void stop(osmium::thread::Pool *) override {}
+    void stop(osmium::thread::Pool *) noexcept override {}
     void commit() override;
 
     bool need_forward_dependencies() const noexcept override { return false; }
 
-    void pending_way(osmid_t, bool) override {}
-    void pending_relation(osmid_t, bool) override {}
+    void pending_way(osmid_t, bool) noexcept override {}
+    void pending_relation(osmid_t, bool) noexcept override {}
 
     void node_add(osmium::Node const &node) override;
     void way_add(osmium::Way *way) override;
@@ -81,7 +80,7 @@ class output_gazetteer_t : public output_t
     gazetteer_style_t m_style;
 
     geom::osmium_builder_t m_builder;
-    osmium::memory::Buffer osmium_buffer;
+    osmium::memory::Buffer m_osmium_buffer;
 };
 
 #endif // OSM2PGSQL_OUTPUT_GAZETTEER_HPP
