Generalize building clusters into built-up areas (#3177)

* Framework for polygon cluster geo modifier
* PolyClusterGeoModifier work
* Simple ClosePointHash based clustering without extra distance check
* Change Geometry Modifier filtering to use TagAdvancedCriterion
* Modified all Geo Modifier rules and docs to use Feature Filtering format
* Check all nodes instead of just centroid for clustering
* Clustering by node with distance check, work in progress
* Clustering by node with distance check, missing file
* Recursive approach to cluster logic
* Implement the use of the AlphaShape class to create a cluster polygon
* AlphaShape geometry generation, in progress
* Split long edges, add more debug logic
* PolyClusterGeoModifier work
* Parameter option support for PolyClusterGeomModifier
* Fixed if () spacing in all C++ modules
* fixed for () and foreach () spacing in all C++ modules
* Fixed while () spacing in all C++ modules
* Added class comment , cleanup
* Added option to check for intersections
* Added test for poly_cluster geo modifier
* cleanup
* Copyright update
* Replaced boost shared_ptr with std
* Minor updates to formatting and spelling

Author: matthias1231

conf/core/ConfigOptions.asciidoc

@@ -980,25 +980,35 @@ hoot::GeometryModifierOp.
 ==== Rule File Format
 -----
 {
-    "way_to_poly":    // command: way_to_poly, collapse_poly, etc.,
-                      // see implementations of GeometryModifierAction
+    "way_to_poly":    // Command: way_to_poly, collapse_poly, etc.
+                      // See implementations of GeometryModifierAction
     {
-        "filter":     // filter for matching elements to process, element must
-                      // have all tags with matching keys/values to be processed
+        "filter":     // Filter for limiting the elements to process. The modifier uses the
+                      // Feature Filtering logic as used for conflation (FeatureFiltering.asciidoc)
         {
-            "aeroway": "runway"
+            "must":
+            [
+                {
+                    "tag": "aeroway=runway"
+                }
+            ]
         },
-        "arguments":  // arguments specific to the selected command
+        "arguments":  // Arguments specific to the selected command
         {
             "default_width_m": 10,
             "width_tag_m" : "width"
         }
     },
-    "collapse_poly":  // next command: all commands defined are processed in sequence
+    "collapse_poly":  // Next command: all commands defined are processed in sequence
     {
         "filter":
         {
-            "building": "yes"
+        "must":
+            [
+                {
+                    "tag": "building=yes"
+                }
+            ]
         },
         "arguments":
         {

conf/core/GeometryModifierRules.json

@@ -3,7 +3,12 @@
     {
         "filter":
         {
-            "aeroway": "runway"
+            "must":
+            [
+                {
+                    "tag": "aeroway=runway"
+                }
+            ]
         },
         "arguments":
         {
@@ -15,7 +20,12 @@
     {
         "filter":
         {
-            "aeroway": "taxiway"
+            "must":
+            [
+                {
+                    "tag": "aeroway=taxiway"
+                }
+            ]
         },
         "arguments":
         {
@@ -27,8 +37,13 @@
     {
         "filter":
         {
-            "building": "yes"
-        },
+            "must":
+            [
+                {
+                    "tag": "building=yes"
+                }
+            ]
+        },        
         "arguments":
         {
             "max_area_in_m": 15000
@@ -38,7 +53,12 @@
     {
         "filter":
         {
-            "bridge": "yes"
+            "must":
+            [
+                {
+                    "tag": "bridge=yes"
+                }
+            ]
         },
         "arguments":
         {

hoot-core-test/src/test/cpp/hoot/core/index/ClosePointHashTest.cpp

@@ -77,7 +77,7 @@ class ClosePointHashTest : public HootTestFixture
 
     int count = 0;
     cph.resetIterator();
-    while(cph.next())
+    while (cph.next())
     {
       const vector<long>& v = cph.getMatch();
       count++;
@@ -126,7 +126,7 @@ class ClosePointHashTest : public HootTestFixture
 
     int count = 0;
     cph.resetIterator();
-    while(cph.next())
+    while (cph.next())
     {
       const vector<long>& v = cph.getMatch();
 

hoot-core-test/src/test/cpp/hoot/core/io/ServiceHootApiDbTest.cpp

@@ -246,7 +246,7 @@ class ServiceHootApiDbTest : public HootTestFixture
     int ctr = 0;
     while (nodeResultIterator->next())
     {
-      for(int j = 0; j < 10; j++) { LOG_TRACE("VALUE = "+nodeResultIterator->value(j).toString()); }
+      for (int j = 0; j < 10; j++) { LOG_TRACE("VALUE = " + nodeResultIterator->value(j).toString()); }
 
       HOOT_STR_EQUALS(nodeId, nodeResultIterator->value(0).toLongLong());
       HOOT_STR_EQUALS(38.0, nodeResultIterator->value(1).toDouble());

hoot-core-test/src/test/cpp/hoot/core/io/ServicesDbTestUtils.cpp

@@ -155,9 +155,9 @@ void ServicesDbTestUtils::deleteUser(QString email)
 
 int ServicesDbTestUtils::findIndex(const QList<QString>& keys, const QString& key)
 {
-  for(int i=0;i<keys.size();i++)
+  for (int i = 0; i < keys.size(); i++)
   {
-    if(keys[i]==key) return i;
+    if (keys[i] == key) return i;
   }
 
   // didn't find a match so return -1

hoot-core/src/main/cpp/hoot/core/algorithms/FrechetDistance.cpp

@@ -277,10 +277,10 @@ vector<frechet_subline> FrechetDistance::matchingSublines(Meters maxDistance)
         if (_matrix[r][c] < maxDistance)
         {
           //  Check above and left to eliminate starting points that lie along a path already started
-          if( (r > 0 && _matrix[r - 1][c] < maxDistance) ||
+          if ((r > 0 && _matrix[r - 1][c] < maxDistance) ||
               (c > 0 && _matrix[r][c - 1] < maxDistance) ||
               (r > 0 && c > 0 && _matrix[r - 1][c - 1] < maxDistance)
-            )
+             )
             continue;
           starts.push_back(vertex_match(r, c));
         }

hoot-core/src/main/cpp/hoot/core/algorithms/LongestCommonNodeString.cpp

@@ -49,7 +49,7 @@ int LongestCommonNodeString::apply()
   _i1 = -1;
   _i2 = -1;
 
-  if(_w1->getNodeCount() == 0 || _w2->getNodeCount() == 0)
+  if (_w1->getNodeCount() == 0 || _w2->getNodeCount() == 0)
   {
        return 0;
   }
@@ -62,17 +62,17 @@ int LongestCommonNodeString::apply()
   int *swap = 0;
   int maxSubstr = 0;
 
-  for(size_t i = 0; i < str1.size(); ++i)
+  for (size_t i = 0; i < str1.size(); ++i)
   {
-    for(size_t j = 0; j < str2.size(); ++j)
+    for (size_t j = 0; j < str2.size(); ++j)
     {
-      if(str1[i] != str2[j])
+      if (str1[i] != str2[j])
       {
         curr[j] = 0;
       }
       else
       {
-        if(i == 0 || j == 0)
+        if (i == 0 || j == 0)
         {
           curr[j] = 1;
         }

hoot-core/src/main/cpp/hoot/core/algorithms/alpha-shape/AlphaShape.cpp

@@ -151,7 +151,7 @@ inline double distance(double x1, double x2, double y1, double y2)
 AlphaShape::AlphaShape(double alpha)
 {
   _alpha = alpha;
-  _dt.reset(new Tgs::DelaunayTriangulation);
+  _pDelauneyTriangles.reset(new Tgs::DelaunayTriangulation);
 }
 
 WayPtr AlphaShape::_addFaceAsWay(const Face* face, const std::shared_ptr<OsmMap>& map)
@@ -330,7 +330,7 @@ void AlphaShape::insert(const vector<pair<double, double>>& points)
     {
       PROGRESS_TRACE("Progress: " << i << " of " << randomized.size() - 1 << "          ");
     }
-    _dt->insert(randomized[i].first, randomized[i].second);
+    _pDelauneyTriangles->insert(randomized[i].first, randomized[i].second);
   }
   LOG_TRACE("Progress: " << randomized.size() - 1 << " of " << randomized.size() - 1 << "          ");
 }
@@ -359,7 +359,7 @@ std::shared_ptr<Geometry> AlphaShape::toGeometry()
   Envelope e;
   double preUnionArea = 0.0;
   int i = 0;
-  for (FaceIterator fi = _dt->getFaceIterator(); fi != _dt->getFaceEnd(); fi++)
+  for (FaceIterator fi = _pDelauneyTriangles->getFaceIterator(); fi != _pDelauneyTriangles->getFaceEnd(); fi++)
   {
     const Face& f = *fi;
     i++;
@@ -480,7 +480,7 @@ std::shared_ptr<Geometry> AlphaShape::toGeometry()
 QString AlphaShape::toString()
 {
   QString result;
-  Edge start = _dt->getStartingEdge();
+  Edge start = _pDelauneyTriangles->getStartingEdge();
   Edge e = start;
 
   do

hoot-core/src/main/cpp/hoot/core/algorithms/alpha-shape/AlphaShape.h

@@ -84,7 +84,7 @@ class AlphaShape
 
   double _alpha;
 
-  std::shared_ptr<Tgs::DelaunayTriangulation> _dt;
+  std::shared_ptr<Tgs::DelaunayTriangulation> _pDelauneyTriangles;
   std::set<std::pair<double, double>> _outsidePoint;
 
   std::shared_ptr<hoot::Way> _addFaceAsWay(const Tgs::Face* face, const std::shared_ptr<OsmMap>& map);

hoot-core/src/main/cpp/hoot/core/algorithms/subline-matching/MaximalNearestSubline.cpp

@@ -72,7 +72,7 @@ MaximalNearestSubline::MaximalNearestSubline(const ConstOsmMapPtr& map,
 Meters MaximalNearestSubline::_calculateIntervalLength()
 {
   Meters result = -1;
-  if(_maxInterval[0].isValid() && _maxInterval[1].isValid())
+  if (_maxInterval[0].isValid() && _maxInterval[1].isValid())
   {
     Meters d0 = _maxInterval[0].calculateDistanceOnWay();
     Meters d1 = _maxInterval[1].calculateDistanceOnWay();