Skip to content

v0.2.55..v0.2.56 changeset HighwaySnapMerger.h

Garret Voltz edited this page Aug 14, 2020 · 3 revisions
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwaySnapMerger.h b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwaySnapMerger.h
index 701c1f6..ed0c3a5 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwaySnapMerger.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwaySnapMerger.h
@@ -42,7 +42,7 @@ class WaySublineCollection;
  * Note that this was originally written specifically for roads, but now is used by several linear
  * script routines, including railway and river.
  *
- * @todo rename to SnapMergerJs
+ * @todo rename to LinearSnapMerger
  */
 class HighwaySnapMerger : public HighwayMergerAbstract
 {
@@ -51,12 +51,11 @@ public:
 
   static std::string className() { return "hoot::HighwaySnapMerger"; }
 
-  static int logWarnCount;
-
   HighwaySnapMerger();
   HighwaySnapMerger(
     const std::set<std::pair<ElementId, ElementId>>& pairs,
     const std::shared_ptr<SublineStringMatcher>& sublineMatcher);
+  virtual ~HighwaySnapMerger() = default;
 
   virtual void apply(const OsmMapPtr& map, std::vector<std::pair<ElementId, ElementId>>& replaced);
 
@@ -88,9 +87,13 @@ protected:
 
 private:
 
+  static int logWarnCount;
+
   // indicates which matcher matched the elements being processed by this merger
   QString _matchedBy;
 
+  bool _writeDebugMaps;
+
   /*
    * Returns true if the way directly connects the left and right ways. There is some tolerance
    * for "directly". See ticket #951 for details.
Clone this wiki locally