v0.2.48..v0.2.49 changeset OverwriteTagMerger.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/schema/OverwriteTagMerger.cpp b/hoot-core/src/main/cpp/hoot/core/schema/OverwriteTagMerger.cpp
index c09e3e6..b74359e 100644
--- a/hoot-core/src/main/cpp/hoot/core/schema/OverwriteTagMerger.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/schema/OverwriteTagMerger.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2017, 2018 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "OverwriteTagMerger.h"
 
@@ -46,12 +46,18 @@ Tags OverwriteTagMerger::mergeTags(const Tags& t1, const Tags& t2, ElementType /
 {
   if (_swap)
   {
-    return TagComparator::getInstance().overwriteMerge(t2, t1);
+    return TagComparator::getInstance().overwriteMerge(t2, t1, _overwriteExcludeTagKeys);
   }
   else
   {
-    return TagComparator::getInstance().overwriteMerge(t1, t2);
+    return TagComparator::getInstance().overwriteMerge(t1, t2, _overwriteExcludeTagKeys);
   }
 }
 
+void OverwriteTagMerger::setConfiguration(const Settings& conf)
+{
+  ConfigOptions config = ConfigOptions(conf);
+  setOverwriteExcludeTagKeys(config.getTagMergerOverwriteExclude());
+}
+
 }