From 2931c8d62b2a2c2f79d458f2ff4bbfe3b6645acf Mon Sep 17 00:00:00 2001
From: mmd-osm <mmd.osm@gmail.com>
Date: Tue, 14 Aug 2018 11:42:02 +0200
Subject: [PATCH] Include num_changes field as changes_count in changeset
 xml&json response Fixes #156

---
 src/json_formatter.cpp                        | 3 +++
 src/xml_formatter.cpp                         | 1 +
 test/changesets.testcore/read.case            | 2 +-
 test/changesets.testcore/read_discussion.case | 2 +-
 test/changesets.testcore/read_nonpublic.case  | 2 +-
 test/changesets.testcore/read_open.case       | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/json_formatter.cpp b/src/json_formatter.cpp
index 557171a8f..bba67f19e 100644
--- a/src/json_formatter.cpp
+++ b/src/json_formatter.cpp
@@ -253,6 +253,9 @@ void json_formatter::write_changeset(const changeset_info &elem,
   writer->object_key("comments_count");
   writer->entry_int(elem.comments_count);
 
+  writer->object_key("changes_count");
+  writer->entry_int(elem.num_changes);
+
   write_tags(tags);
 
   if (include_comments && !comments.empty()) {
diff --git a/src/xml_formatter.cpp b/src/xml_formatter.cpp
index 8a52704eb..ade232c45 100644
--- a/src/xml_formatter.cpp
+++ b/src/xml_formatter.cpp
@@ -202,6 +202,7 @@ void xml_formatter::write_changeset(const changeset_info &elem,
   }
 
   writer->attribute("comments_count", elem.comments_count);
+  writer->attribute("changes_count", elem.num_changes);
 
   write_tags(tags);
 
diff --git a/test/changesets.testcore/read.case b/test/changesets.testcore/read.case
index 4df69fabc..710f6240d 100644
--- a/test/changesets.testcore/read.case
+++ b/test/changesets.testcore/read.case
@@ -8,7 +8,7 @@ Content-Type: text/xml; charset=utf-8
 !Content-Disposition: 
 ---
 <osm version="0.6" generator="***" copyright="***" attribution="***" license="***">
-  <changeset id="1" user="FakeUser1" uid="1" created_at="2015-08-09T10:33:13Z" closed_at="2015-08-09T11:33:13Z" open="false" min_lat="51.5288506" min_lon="-0.1465242" max_lat="51.5288620" max_lon="-0.1464925" comments_count="1">
+  <changeset id="1" user="FakeUser1" uid="1" created_at="2015-08-09T10:33:13Z" closed_at="2015-08-09T11:33:13Z" open="false" min_lat="51.5288506" min_lon="-0.1465242" max_lat="51.5288620" max_lon="-0.1464925" comments_count="1" changes_count="1">
     <tag k="created_by" v="manually"/>
   </changeset>
 </osm>
diff --git a/test/changesets.testcore/read_discussion.case b/test/changesets.testcore/read_discussion.case
index 98f375c31..508fe1d75 100644
--- a/test/changesets.testcore/read_discussion.case
+++ b/test/changesets.testcore/read_discussion.case
@@ -8,7 +8,7 @@ Content-Type: text/xml; charset=utf-8
 !Content-Disposition: 
 ---
 <osm version="0.6" generator="***" copyright="***" attribution="***" license="***">
-  <changeset id="1" user="FakeUser1" uid="1" created_at="2015-08-09T10:33:13Z" closed_at="2015-08-09T11:33:13Z" open="false" min_lat="51.5288506" min_lon="-0.1465242" max_lat="51.5288620" max_lon="-0.1464925" comments_count="1">
+  <changeset id="1" user="FakeUser1" uid="1" created_at="2015-08-09T10:33:13Z" closed_at="2015-08-09T11:33:13Z" open="false" min_lat="51.5288506" min_lon="-0.1465242" max_lat="51.5288620" max_lon="-0.1464925" comments_count="1" changes_count="1">
     <tag k="created_by" v="manually"/>
     <discussion>
       <comment date="2015-08-09T10:33:13Z" uid="1" user="FakeUser1">
diff --git a/test/changesets.testcore/read_nonpublic.case b/test/changesets.testcore/read_nonpublic.case
index 7e42794bd..7ca04fbc9 100644
--- a/test/changesets.testcore/read_nonpublic.case
+++ b/test/changesets.testcore/read_nonpublic.case
@@ -8,5 +8,5 @@ Content-Type: text/xml; charset=utf-8
 !Content-Disposition: 
 ---
 <osm version="0.6" generator="***" copyright="***" attribution="***" license="***">
-  <changeset id="2" created_at="2015-09-05T20:16:06Z" closed_at="2015-09-05T20:16:06Z" comments_count="0" open="false"/>
+  <changeset id="2" created_at="2015-09-05T20:16:06Z" closed_at="2015-09-05T20:16:06Z" comments_count="0" changes_count="0" open="false"/>
 </osm>
diff --git a/test/changesets.testcore/read_open.case b/test/changesets.testcore/read_open.case
index 23cc0731e..cd05a0d9b 100644
--- a/test/changesets.testcore/read_open.case
+++ b/test/changesets.testcore/read_open.case
@@ -8,7 +8,7 @@ Content-Type: text/xml; charset=utf-8
 !Content-Disposition: 
 ---
 <osm version="0.6" generator="***" copyright="***" attribution="***" license="***">
-  <changeset id="1" user="FakeUser1" uid="1" created_at="2015-08-09T10:33:13Z" open="true" min_lat="51.5288506" min_lon="-0.1465242" max_lat="51.5288620" max_lon="-0.1464925" comments_count="1">
+  <changeset id="1" user="FakeUser1" uid="1" created_at="2015-08-09T10:33:13Z" open="true" min_lat="51.5288506" min_lon="-0.1465242" max_lat="51.5288620" max_lon="-0.1464925" comments_count="1" changes_count="1">
     <tag k="created_by" v="manually"/>
   </changeset>
 </osm>