v0.2.47..v0.2.48 changeset WayJoiner.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/algorithms/WayJoiner.cpp b/hoot-core/src/main/cpp/hoot/core/algorithms/WayJoiner.cpp
index 5428b1f..601df7e 100644
--- a/hoot-core/src/main/cpp/hoot/core/algorithms/WayJoiner.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/algorithms/WayJoiner.cpp
@@ -36,6 +36,7 @@
 #include <hoot/core/ops/RecursiveElementRemover.h>
 #include <hoot/core/ops/ReplaceElementOp.h>
 #include <hoot/core/schema/TagMergerFactory.h>
+#include <hoot/core/util/ConfigOptions.h>
 
 #include <unordered_set>
 #include <vector>
@@ -45,9 +46,9 @@ using namespace std;
 namespace hoot
 {
 
-WayJoiner::WayJoiner()
-    : _leavePid(false),
-      _numJoined(0)
+WayJoiner::WayJoiner() :
+_leavePid(false),
+_numJoined(0)
 {
 }
 
@@ -168,7 +169,7 @@ void WayJoiner::_joinAtNode()
   }
 }
 
-bool WayJoiner::_areJoinable(const WayPtr& w1, const WayPtr& w2)
+bool WayJoiner::_areJoinable(const WayPtr& w1, const WayPtr& w2) const
 {
   return
     //  Same status => Joinable
@@ -182,6 +183,7 @@ bool WayJoiner::_areJoinable(const WayPtr& w1, const WayPtr& w2)
 
 void WayJoiner::_resetParents()
 {
+  LOG_VARD(_leavePid);
   if (_leavePid)
     return;
   WayMap ways = _map->getWays();