Skip to content

v0.2.53..v0.2.54 changeset WayJoiner.h

Garret Voltz edited this page Mar 31, 2020 · 1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/algorithms/WayJoiner.h b/hoot-core/src/main/cpp/hoot/core/algorithms/WayJoiner.h
index 8c04816..037d571 100644
--- a/hoot-core/src/main/cpp/hoot/core/algorithms/WayJoiner.h
+++ b/hoot-core/src/main/cpp/hoot/core/algorithms/WayJoiner.h
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 
 #ifndef WAYJOINER_H
@@ -69,12 +69,6 @@ protected:
   virtual void _joinParentChild();
 
   /**
-   * @brief joinSiblings Joining algorithm that searches for all ways that have the same parent id,
-   *    attempts to order them into adjoining way order, then joins them
-   */
-  virtual void _joinSiblings();
-
-  /**
    * @brief joinAtNode Joining algorithm that searches all ways that have a parent id and tries
    *    to join them with adjacent ways that have the same tags
    */
@@ -87,12 +81,6 @@ protected:
   virtual bool _areJoinable(const WayPtr& w1, const WayPtr& w2) const;
 
   /**
-   * @brief resetParents Resets parent id for all ways after joining operation has completed
-   *    does nothing if _leavePid is true
-   */
-  virtual void _resetParents();
-
-  /**
    * @brief rejoinSiblings Function that rejoins ways that all have the same parent id
    *    but that parent way doesn't exist
    * @param way_ids Deque of sorted ways to join
@@ -112,6 +100,20 @@ protected:
   /** Pointer to the map to work on */
   OsmMapPtr _map;
   int _numJoined;
+
+private:
+
+  /**
+   * @brief joinSiblings Joining algorithm that searches for all ways that have the same parent id,
+   *    attempts to order them into adjoining way order, then joins them
+   */
+  void _joinSiblings();
+
+  /**
+   * @brief resetParents Resets parent id for all ways after joining operation has completed
+   *    does nothing if _leavePid is true
+   */
+  void _resetParents();
 };
 
 }
Clone this wiki locally