v0.2.49..v0.2.50 changeset MatchFactory.cpp - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.cpp
index 69f5504..4e54165 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.cpp
@@ -54,14 +54,14 @@ MatchFactory::MatchFactory()
   setConfiguration(conf());
 }
 
-Match* MatchFactory::createMatch(const ConstOsmMapPtr& map, ElementId eid1, ElementId eid2) const
+MatchPtr MatchFactory::createMatch(const ConstOsmMapPtr& map, ElementId eid1, ElementId eid2) const
 {
   LOG_VART(eid1);
   LOG_VART(eid2);
 
   for (size_t i = 0; i < _creators.size(); ++i)
   {
-    Match* m = _creators[i]->createMatch(map, eid1, eid2);
+    MatchPtr m = _creators[i]->createMatch(map, eid1, eid2);
 
     if (m)
     {
@@ -72,7 +72,7 @@ Match* MatchFactory::createMatch(const ConstOsmMapPtr& map, ElementId eid1, Elem
   return 0;
 }
 
-void MatchFactory::createMatches(const ConstOsmMapPtr& map, vector<const Match*>& matches,
+void MatchFactory::createMatches(const ConstOsmMapPtr& map, std::vector<ConstMatchPtr>& matches,
   const Envelope& bounds, std::shared_ptr<const MatchThreshold> threshold) const
 {
   for (size_t i = 0; i < _creators.size(); ++i)
@@ -169,8 +169,8 @@ void MatchFactory::_tempFixDefaults()
 {
   QStringList matchCreators = ConfigOptions().getMatchCreators();
   QStringList mergerCreators = ConfigOptions().getMergerCreators();
-  LOG_VARD(matchCreators);
-  LOG_VARD(mergerCreators);
+  LOG_VART(matchCreators);
+  LOG_VART(mergerCreators);
 
   if ((matchCreators.size() == 0 || mergerCreators.size() == 0))
   {
@@ -208,42 +208,42 @@ void MatchFactory::_tempFixDefaults()
         fixedMergerCreators.append("hoot::PoiPolygonMergerCreator");
       }
     }
-    LOG_DEBUG("Temp fixing merger.creators...");
+    LOG_TRACE("Temp fixing merger.creators...");
     conf().set("merger.creators", fixedMergerCreators.join(";"));
   }
-  LOG_VARD(mergerCreators);
+  LOG_VART(mergerCreators);
 
   //fix way subline matcher options - https://github.com/ngageoint/hootenanny-ui/issues/970
   if (matchCreators.contains("hoot::NetworkMatchCreator") &&
       ConfigOptions().getWaySublineMatcher() != "hoot::FrechetSublineMatcher" &&
       ConfigOptions().getWaySublineMatcher() != "hoot::MaximalSublineMatcher")
   {
-    LOG_DEBUG("Temp fixing way.subline.matcher...");
+    LOG_TRACE("Temp fixing way.subline.matcher...");
     conf().set("way.subline.matcher", "hoot::MaximalSublineMatcher");
   }
   else if (matchCreators.contains("hoot::HighwayMatchCreator") &&
            ConfigOptions().getWaySublineMatcher() != "hoot::FrechetSublineMatcher" &&
            ConfigOptions().getWaySublineMatcher() != "hoot::MaximalNearestSublineMatcher")
   {
-    LOG_DEBUG("Temp fixing way.subline.matcher...");
+    LOG_TRACE("Temp fixing way.subline.matcher...");
     conf().set("way.subline.matcher", "hoot::MaximalNearestSublineMatcher");
   }
-  LOG_VARD(ConfigOptions().getWaySublineMatcher());
+  LOG_VART(ConfigOptions().getWaySublineMatcher());
 
   //fix highway classifier - https://github.com/ngageoint/hootenanny-ui/issues/971
   if (matchCreators.contains("hoot::NetworkMatchCreator") &&
       ConfigOptions().getConflateMatchHighwayClassifier() != "hoot::HighwayExpertClassifier")
   {
-    LOG_DEBUG("Temp fixing conflate.match.highway.classifier...");
+    LOG_TRACE("Temp fixing conflate.match.highway.classifier...");
     conf().set("conflate.match.highway.classifier", "hoot::HighwayExpertClassifier");
   }
   else if (matchCreators.contains("hoot::HighwayMatchCreator") &&
            ConfigOptions().getConflateMatchHighwayClassifier() != "hoot::HighwayRfClassifier")
   {
-    LOG_DEBUG("Temp fixing conflate.match.highway.classifier...");
+    LOG_TRACE("Temp fixing conflate.match.highway.classifier...");
     conf().set("conflate.match.highway.classifier", "hoot::HighwayRfClassifier");
   }
-  LOG_VARD(ConfigOptions().getConflateMatchHighwayClassifier());
+  LOG_VART(ConfigOptions().getConflateMatchHighwayClassifier());
 }
 
 void MatchFactory::setConfiguration(const Settings& s)