v0.2.55..v0.2.56 changeset NodeMatcher.cpp - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/matching/NodeMatcher.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/matching/NodeMatcher.cpp
index 9307fcf..a7c53a0 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/matching/NodeMatcher.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/matching/NodeMatcher.cpp
@@ -93,7 +93,7 @@ bool NodeMatcher::isNetworkFeatureType(ConstElementPtr element)
     if (_networkFeatureTypeCriteria.at(i)->isSatisfied(element))
     {
       LOG_TRACE(
-        element/*->getElementId()*/ << " recognized as network feature types by " <<
+        element->getElementId() << " recognized as network feature types by " <<
         _networkFeatureTypeCriteria.at(i)->toString() << ".");
       return true;
     }
@@ -108,6 +108,8 @@ vector<Radians> NodeMatcher::calculateAngles(const OsmMap* map, long nid,
   result.reserve(wids.size());
 
   LOG_VART(nid);
+  ConstNodePtr node = map->getNode(nid);
+  LOG_VART(node);
   QSet<long> badWayIds;
   for (set<long>::const_iterator it = wids.begin(); it != wids.end(); ++it)
   {
@@ -224,10 +226,14 @@ int NodeMatcher::getDegree(ElementId nid)
 double NodeMatcher::scorePair(long nid1, long nid2)
 {
   ConstNodePtr n1 = _map->getNode(nid1);
+  LOG_VART(n1->getElementId());
   ConstNodePtr n2 = _map->getNode(nid2);
+  LOG_VART(n2->getElementId());
 
   const set<long>& wids1 = _map->getIndex().getNodeToWayMap()->at(nid1);
+  LOG_VART(wids1);
   const set<long>& wids2 = _map->getIndex().getNodeToWayMap()->at(nid2);
+  LOG_VART(wids2);
 
   double acc = 0;
   for (set<long>::const_iterator it = wids1.begin(); it != wids1.end(); ++it)
@@ -238,12 +244,17 @@ double NodeMatcher::scorePair(long nid1, long nid2)
   {
     acc = max(acc, _map->getWay(*it)->getCircularError());
   }
+  LOG_VART(acc);
 
   vector<Radians> theta1 = calculateAngles(_map.get(), nid1, wids1, _delta);
+  LOG_VART(theta1);
   vector<Radians> theta2 = calculateAngles(_map.get(), nid2, wids2, _delta);
+  LOG_VART(theta2);
 
   int s1 = theta1.size();
+  LOG_VART(s1);
   int s2 = theta2.size();
+  LOG_VART(s2);
 
   if (s1 < 3 || s2 < 3)
   {