v0.2.53..v0.2.54 changeset ConflatableCriteriaVisitor.cpp - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/visitors/ConflatableCriteriaVisitor.cpp b/hoot-core/src/main/cpp/hoot/core/visitors/ConflatableCriteriaVisitor.cpp
index 321f7e0..96da0a8 100644
--- a/hoot-core/src/main/cpp/hoot/core/visitors/ConflatableCriteriaVisitor.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/visitors/ConflatableCriteriaVisitor.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "ConflatableCriteriaVisitor.h"
 
@@ -30,6 +30,7 @@
 #include <hoot/core/util/Factory.h>
 #include <hoot/core/schema/MetadataTags.h>
 #include <hoot/core/criterion/ConflatableElementCriterion.h>
+#include <hoot/core/util/Log.h>
 
 namespace hoot
 {
@@ -42,8 +43,10 @@ ConflatableCriteriaVisitor::ConflatableCriteriaVisitor()
 
 void ConflatableCriteriaVisitor::visit(const std::shared_ptr<Element>& e)
 {
+  LOG_VART(e->getElementId());
+
   const QStringList conflatableCriteria =
-    ConflatableElementCriterion::getConflatableCriteriaForElement(e);
+    ConflatableElementCriterion::getConflatableCriteriaForElement(e, _map);
   LOG_VART(conflatableCriteria.size());
   QString conflatableCriteriaStr;
   for (int i = 0; i < conflatableCriteria.size(); i++)
@@ -52,7 +55,7 @@ void ConflatableCriteriaVisitor::visit(const std::shared_ptr<Element>& e)
   }
   conflatableCriteriaStr.chop(1);
   LOG_VART(conflatableCriteriaStr);
-  e->getTags()[MetadataTags::HootConflatableCriteria()] =  conflatableCriteriaStr;
+  e->getTags()[MetadataTags::HootConflatableCriteria()] = conflatableCriteriaStr;
 }
 
 }