add support for --extra-attributes to Gazetteer output

Author: Nakaner

gazetteer-style.cpp

@@ -42,6 +42,7 @@ void gazetteer_style_t::clear()
     m_main.clear();
     m_names.clear();
     m_extra.clear();
+    m_metadata.clear();
     m_address.clear();
     m_operator = nullptr;
     m_admin_level = MAX_ADMINLEVEL;
@@ -72,6 +73,11 @@ void gazetteer_style_t::load_style(std::string const &filename)
     }
 }
 
+void gazetteer_style_t::set_metadata(const bool enabled)
+{
+    m_metadata_enabled = enabled;
+}
+
 gazetteer_style_t::flag_t gazetteer_style_t::parse_flags(std::string const &str)
 {
     flag_t out = 0;
@@ -349,6 +355,45 @@ void gazetteer_style_t::process_tags(osmium::OSMObject const &o)
     } else if (postcode_fallback && postcode) {
         m_main.emplace_back("place", "postcode", SF_MAIN | SF_MAIN_FALLBACK);
     }
+
+    // add metadata fields as tags if enabled
+    if (m_metadata_enabled) {
+        if (o.version()) {
+            add_metadata_field_num<osmium::object_version_type>("osm_version", o.version());
+        }
+        if (o.uid()) {
+            add_metadata_field_num<osmium::user_id_type>("osm_uid", o.uid());
+        }
+
+        if (o.user() && *(o.user()) != '\0') {
+            std::string username = o.user();
+            add_metadata_field("osm_user", std::move(username));
+        }
+
+        if (o.changeset()) {
+            add_metadata_field_num<osmium::changeset_id_type>("osm_changeset", o.changeset());
+        }
+
+        if (o.timestamp()) {
+            add_metadata_field("osm_timestamp", std::move(o.timestamp().to_iso()));
+        }
+    }
+}
+
+void gazetteer_style_t::add_metadata_field(const std::string&& field, const std::string&& value) {
+    // We have to work with std::string, not char* because metadata fields converted to char*
+    // would require an allocation on heap and a cleanup at the end.
+    flag_t flag = find_flag(field.c_str(), value.c_str());
+    if (flag & SF_EXTRA) {
+        m_metadata.emplace_back(std::move(field), std::move(value));
+    }
+}
+
+template <typename T>
+void gazetteer_style_t::add_metadata_field_num(const std::string&& field, const T value) {
+    // This method is not linked to from outside this class. Therefore, it can stay in the source file.
+    std::string value_str = std::to_string(value);
+    add_metadata_field(std::move(field), std::move(value_str));
 }
 
 void gazetteer_style_t::copy_out(osmium::OSMObject const &o,
@@ -456,13 +501,16 @@ bool gazetteer_style_t::copy_out_maintag(pmaintag_t const &tag,
         buffer.finish_hash();
     }
     // extra tags
-    if (m_extra.empty()) {
+    if (m_extra.empty() && m_metadata.empty()) {
         buffer.add_null_column();
     } else {
         buffer.new_hash();
         for (auto const &entry : m_extra) {
             buffer.add_hash_elem(entry.first, entry.second);
         }
+        for (auto const &entry : m_metadata) {
+            buffer.add_hash_elem(entry.first, entry.second);
+        }
         buffer.finish_hash();
     }
     // add the geometry - encoding it to hex along the way

gazetteer-style.hpp

@@ -14,6 +14,7 @@ class gazetteer_style_t
 {
     using flag_t = uint16_t;
     using ptag_t = std::pair<char const *, char const *>;
+    using ptag_str_t = std::pair<const std::string, const std::string>;
     using pmaintag_t = std::tuple<char const *, char const *, flag_t>;
 
     enum style_flags
@@ -66,11 +67,17 @@ class gazetteer_style_t
 
     bool has_data() const { return !m_main.empty(); }
 
+    void set_metadata(const bool enabled);
+
 private:
     void add_style_entry(std::string const &key, std::string const &value,
                          flag_t flags);
     flag_t parse_flags(std::string const &str);
     flag_t find_flag(char const *k, char const *v) const;
+    void add_metadata_field(const std::string&& field, const std::string&& value);
+
+    template <typename T>
+    void add_metadata_field_num(const std::string&& field, const T value);
     bool copy_out_maintag(pmaintag_t const &tag, osmium::OSMObject const &o,
                           std::string const &geom, db_copy_mgr_t &buffer);
     void clear();
@@ -88,6 +95,8 @@ class gazetteer_style_t
     std::vector<ptag_t> m_names;
     /// extratags to include
     std::vector<ptag_t> m_extra;
+    /// metadata fields to include
+    std::vector<ptag_str_t> m_metadata;
     /// addresstags to include
     std::vector<ptag_t> m_address;
     /// value of operator tag
@@ -96,6 +105,11 @@ class gazetteer_style_t
     int m_admin_level;
     /// True if there is an actual name to the object (not a ref).
     bool m_is_named;
+
+    /// enable writing of metadata as tags (osm_version, osm_timestamp, osm_uid, osm_user, osm_changeset)
+    bool m_metadata_enabled {false};
+
+    boost::format m_single_fmt{"%1%\t"};
 };
 
 #endif

output-gazetteer.hpp

@@ -15,6 +15,7 @@
 #include "pgsql.hpp"
 #include "util.hpp"
 
+
 class output_gazetteer_t : public output_t
 {
     output_gazetteer_t(output_gazetteer_t const *other,
@@ -37,6 +38,7 @@ class output_gazetteer_t : public output_t
       osmium_buffer(PLACE_BUFFER_SIZE, osmium::memory::Buffer::auto_grow::yes)
     {
         m_style.load_style(options.style);
+        m_style.set_metadata(options.extra_attributes);
     }
 
     virtual ~output_gazetteer_t();