Add clear_user() function to OSMObject and Changeset.

Author: joto

include/osmium/osm/changeset.hpp

@@ -366,6 +366,11 @@ namespace osmium {
             return reinterpret_cast<const char*>(data() + sizeof(Changeset));
         }
 
+        /// Clear user name.
+        void clear_user() noexcept {
+            std::memset(data() + sizeof(Changeset), 0, user_size());
+        }
+
         /// Get the list of tags.
         const TagList& tags() const {
             return osmium::detail::subitem_of_type<const TagList>(cbegin(), cend());

include/osmium/osm/object.hpp

@@ -318,6 +318,11 @@ namespace osmium {
             return reinterpret_cast<const char*>(data() + sizeof_object());
         }
 
+        /// Clear user name.
+        void clear_user() noexcept {
+            std::memset(data() + sizeof_object(), 0, user_size());
+        }
+
         /// Get the list of tags for this object.
         const TagList& tags() const {
             return osmium::detail::subitem_of_type<const TagList>(cbegin(), cend());

test/t/builder/test_object_builder.cpp

@@ -441,3 +441,40 @@ TEST_CASE("set_user with length on changeset") {
     REQUIRE(std::string{"user"} == changeset.user());
 }
 
+TEST_CASE("clear_user should clear the user field but nothing else") {
+    osmium::memory::Buffer buffer{1024 * 10};
+    std::string user = "user";
+
+    {
+        osmium::builder::NodeBuilder builder{buffer};
+        builder.set_id(17)
+            .set_visible(true)
+            .set_version(1)
+            .set_changeset(123)
+            .set_uid(555)
+            .set_timestamp("2015-07-01T00:00:01Z")
+            .set_location(osmium::Location{1.2, 3.4})
+            .set_user(user);
+        builder.add_tags({{"highway", "primary"}, {"oneway", "yes"}});
+    }
+
+    auto& node = buffer.get<osmium::Node>(buffer.commit());
+
+    REQUIRE(std::string{"user"} == node.user());
+
+    node.clear_user();
+
+    REQUIRE(std::string{""} == node.user());
+    REQUIRE(node.uid() == 555);
+    REQUIRE(node.tags().size() == 2);
+
+    auto it = node.tags().begin();
+    REQUIRE(it->key() == std::string{"highway"});
+    REQUIRE(it->value() == std::string{"primary"});
+    ++it;
+    REQUIRE(it->key() == std::string{"oneway"});
+    REQUIRE(it->value() == std::string{"yes"});
+    ++it;
+    REQUIRE(it == node.tags().end());
+}
+

test/t/osm/test_changeset.cpp

@@ -142,3 +142,45 @@ TEST_CASE("Create changeset without helper") {
     REQUIRE(++cit == cs.discussion().end());
 }
 
+TEST_CASE("Change changeset") {
+    osmium::memory::Buffer buffer{10 * 1000};
+
+    osmium::builder::add_changeset(buffer,
+        _cid(42),
+        _created_at(time_t(100)),
+        _closed_at(time_t(200)),
+        _num_changes(7),
+        _num_comments(3),
+        _uid(9),
+        _user("user"),
+        _tag("comment", "foo")
+    );
+
+    osmium::Changeset& cs = buffer.get<osmium::Changeset>(0);
+
+    cs.set_id(12);
+    cs.set_created_at(time_t(200));
+    cs.set_closed_at(time_t(300));
+    cs.set_num_changes(3);
+    cs.set_num_comments(4);
+    cs.set_uid(10);
+    cs.clear_user();
+
+    REQUIRE(12 == cs.id());
+    REQUIRE(10 == cs.uid());
+    REQUIRE(3 == cs.num_changes());
+    REQUIRE(4 == cs.num_comments());
+    REQUIRE(cs.closed());
+    REQUIRE(osmium::Timestamp{200} == cs.created_at());
+    REQUIRE(osmium::Timestamp{300} == cs.closed_at());
+    REQUIRE(1 == cs.tags().size());
+    REQUIRE(std::string("") == cs.user());
+    REQUIRE(cs.tags().size() == 1);
+
+    auto it = cs.tags().begin();
+    REQUIRE(it->key() == std::string{"comment"});
+    REQUIRE(it->value() == std::string{"foo"});
+    ++it;
+    REQUIRE(it == cs.tags().end());
+}
+