Skip to content

v0.2.54..v0.2.55 changeset DiffConflator.h

Garret Voltz edited this page Aug 14, 2020 · 1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/DiffConflator.h b/hoot-core/src/main/cpp/hoot/core/conflate/DiffConflator.h
index 5fd5ca6..fd65640 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/DiffConflator.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/DiffConflator.h
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #ifndef DIFFCONFLATOR_H
 #define DIFFCONFLATOR_H
@@ -40,6 +40,7 @@
 #include <hoot/core/util/Configurable.h>
 #include <hoot/core/util/ProgressReporter.h>
 #include <hoot/core/util/Settings.h>
+#include <hoot/core/io/OsmChangesetFileWriter.h>
 
 // tgs
 #include <tgs/HashMap.h>
@@ -178,16 +179,24 @@ public:
    * @param pResultMap the input map
    * @param output the output changeset path
    * @param separateOutput if true, separates geometry and tag changeset output
+   * @param changesetStatsFormat changeset statistics format
    * @param osmApiDbUrl specifies the target OSM API database, if SQL changeset output is specified
    */
-  void writeChangeset(OsmMapPtr pResultMap, QString& output, bool separateOutput,
-                      const QString& osmApiDbUrl = "");
+  void writeChangeset(
+    OsmMapPtr pResultMap, QString& output, bool separateOutput,
+    const ChangesetStatsFormat& changesetStatsFormat =
+      ChangesetStatsFormat(ChangesetStatsFormat::Unknown),
+    const QString& osmApiDbUrl = "");
 
   void calculateStats(OsmMapPtr pResultMap, QList<SingleStat>& stats);
 
   virtual void setProgress(Progress progress) { _progress = progress; }
   virtual unsigned int getNumSteps() const { return 3; }
 
+  QString getGeometryChangesetStats() const { return _geometryChangesetStats; }
+  QString getTagChangesetStats() const { return _tagChangesetStats; }
+  QString getUnifiedChangesetStats() const { return _unifiedChangesetStats; }
+
 private:
 
   OsmMapPtr _pMap;
@@ -219,6 +228,10 @@ private:
 
   long _numSnappedWays;
 
+  QString _geometryChangesetStats;
+  QString _tagChangesetStats;
+  QString _unifiedChangesetStats;
+
   /**
    * Cleans up any resources used by the object during conflation. This also makes exceptions that
    * might be thrown during apply() clean up the leftovers nicely (albeit delayed).
Clone this wiki locally