Merge pull request #435 from mmd-osm/patch/cleanup20

Fixed compiler warning, added test case for negative version

Author: mmd-osm

include/cgimap/api06/changeset_upload/osmobject.hpp

@@ -16,6 +16,7 @@
 #include <charconv>
 #include <map>
 #include <optional>
+#include <string_view>
 
 #include <fmt/core.h>
 
@@ -46,7 +47,7 @@ namespace api06 {
       m_changeset = changeset;
     }
 
-    void set_version(osm_version_t version) {
+    void set_version(int64_t version) {
 
       if (version < 0) {
           throw payload_error("Version may not be negative");
@@ -66,7 +67,7 @@ namespace api06 {
 
     // Setters with string conversions
 
-    void set_changeset(const std::string &changeset) {
+    void set_changeset(std::string_view changeset) {
 
       osm_changeset_id_t _changeset = 0;
 
@@ -82,7 +83,7 @@ namespace api06 {
         throw payload_error("Unexpected parsing error");
     }
 
-    void set_version(const std::string &version) {
+    void set_version(std::string_view version) {
 
       int64_t _version = 0;
 
@@ -98,7 +99,7 @@ namespace api06 {
         throw payload_error("Unexpected parsing error");
     }
 
-    void set_id(const std::string &id) {
+    void set_id(std::string_view id) {
 
       osm_nwr_signed_id_t _id = 0;
 

test/test_parse_osmchange_xml_input.cpp

@@ -190,6 +190,12 @@ TEST_CASE("Modify node, invalid version", "[osmchange][node][xml]") {
   REQUIRE_THROWS_AS(process_testmsg(R"(<osmChange><modify><node changeset="858" version="0" id="123"/></modify></osmChange>)"), http::bad_request);
 }
 
+TEST_CASE("Modify node, invalid, negative version", "[osmchange][node][xml]") {
+  REQUIRE_THROWS_MATCHES(process_testmsg(R"(<osmChange><modify><node changeset="858" version="-1" id="123"/></modify></osmChange>)"), http::bad_request,
+    Catch::Message("Version may not be negative at line 1, column 63"));
+}
+
+
 TEST_CASE("Delete node", "[osmchange][node][xml]") {
   REQUIRE_NOTHROW(process_testmsg(R"(<osmChange><delete><node changeset="858" version="1" id="123"/></delete></osmChange>)"));
 }