Merge pull request #1377 from joto/string-id-list

Rename string_id_list to string_id_list_t and put into utils.hpp

Author: lonvia

src/middle-pgsql.cpp

@@ -229,37 +229,11 @@ void middle_pgsql_t::buffer_store_tags(osmium::OSMObject const &obj, bool attrs)
     }
 }
 
-/**
- * Class for building a stringified list of ids in the format "{id1,id2,id3}"
- * for use in PostgreSQL queries.
- */
-class string_id_list
-{
-public:
-    void add(osmid_t id)
-    {
-        fmt::format_to(std::back_inserter(m_list), "{},", id);
-    }
-
-    bool empty() const noexcept { return m_list.size() == 1; }
-
-    std::string const &get()
-    {
-        assert(!empty());
-        m_list.back() = '}';
-        return m_list;
-    }
-
-private:
-    std::string m_list{"{"};
-
-}; // class string_id_list
-
 std::size_t middle_query_pgsql_t::get_way_node_locations_db(
     osmium::WayNodeList *nodes) const
 {
     size_t count = 0;
-    string_id_list id_list;
+    util::string_id_list_t id_list;
 
     // get nodes where possible from cache,
     // at the same time build a list for querying missing nodes from DB
@@ -446,7 +420,7 @@ middle_query_pgsql_t::rel_way_members_get(osmium::Relation const &rel,
                                           rolelist_t *roles,
                                           osmium::memory::Buffer &buffer) const
 {
-    string_id_list id_list;
+    util::string_id_list_t id_list;
 
     for (auto const &m : rel.members()) {
         if (m.type() == osmium::item_type::way) {

src/util.cpp

@@ -3,6 +3,18 @@
 
 namespace util {
 
+void string_id_list_t::add(osmid_t id)
+{
+    fmt::format_to(std::back_inserter(m_list), "{},", id);
+}
+
+std::string const &string_id_list_t::get()
+{
+    assert(!empty());
+    m_list.back() = '}';
+    return m_list;
+}
+
 std::string human_readable_duration(uint64_t seconds)
 {
     if (seconds < 60) {

src/util.hpp

@@ -52,6 +52,24 @@ class double_to_buffer
     std::array<char, buffer_size> m_buffer;
 };
 
+/**
+ * Class for building a stringified list of ids in the format "{id1,id2,id3}"
+ * for use in PostgreSQL queries.
+ */
+class string_id_list_t
+{
+public:
+    void add(osmid_t id);
+
+    bool empty() const noexcept { return m_list.size() == 1; }
+
+    std::string const &get();
+
+private:
+    std::string m_list{"{"};
+
+}; // class string_id_list_t
+
 /**
  * Helper class for timing with a granularity of seconds. The timer will
  * start on construction and is stopped by calling stop().

tests/test-util.cpp

@@ -35,6 +35,30 @@ TEST_CASE("double_to_buffer 3.141", "[NoDB]")
     REQUIRE(std::strcmp(buffer.c_str(), "3.141") == 0);
 }
 
+TEST_CASE("string_id_list_t with one element", "[NoDB]")
+{
+    util::string_id_list_t list;
+    REQUIRE(list.empty());
+
+    list.add(17);
+
+    REQUIRE_FALSE(list.empty());
+    REQUIRE(list.get() == "{17}");
+}
+
+TEST_CASE("string_id_list_t with several elements", "[NoDB]")
+{
+    util::string_id_list_t list;
+    REQUIRE(list.empty());
+
+    list.add(17);
+    list.add(3);
+    list.add(99);
+
+    REQUIRE_FALSE(list.empty());
+    REQUIRE(list.get() == "{17,3,99}");
+}
+
 TEST_CASE("human readable time durations", "[NoDB]")
 {
     REQUIRE(util::human_readable_duration(0) == "0s");