Delete outdated geometries, fix for Relations multigeometries, add ve…

…rbosito for raw test
hotosm · Apr 8, 2024 · 5daa466 · 5daa466
1 parent 3a66efc
commit 5daa466
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/src/osm/osmchange.cc b/src/osm/osmchange.cc
@@ -189,7 +189,6 @@ OsmChangeFile::buildRelationGeometry(osmobjects::OsmRelation &relation) {
             // Way is not available in cache,
             // possibily because Relation is not in the priority area
             // or way was deleted
-            std::cout << "No Way!" << std::endl;
             return;
         }
 
@@ -213,7 +212,6 @@ OsmChangeFile::buildRelationGeometry(osmobjects::OsmRelation &relation) {
                         // Way is not available in cache,
                         // possibily because Relation is not in the priority area
                         // or way was deleted
-                        std::cout << "No Way!" << std::endl;
                         return;
                     }
                     nextWay = waycache.at(nextWayId);
@@ -379,22 +377,26 @@ OsmChangeFile::buildRelationGeometry(osmobjects::OsmRelation &relation) {
         std::string geometry_str;
         ++i;
         if (relation.isMultiPolygon()) {
-            ss << std::setprecision(12) << bg::wkt(pit->polygon);
-            geometry_str = ss.str();
-            // Erase "POLYGON("
-            geometry_str.erase(0,8);
-            geometry_str.erase(geometry_str.size() - 1);
-            if (geometry_str.size() > 0) {
-                geometry += geometry_str + ",";
+            if (bg::num_points(pit->polygon.outer()) > 0) {
+                ss << std::setprecision(12) << bg::wkt(pit->polygon);
+                geometry_str = ss.str();
+                // Erase "POLYGON("
+                geometry_str.erase(0,8);
+                geometry_str.erase(geometry_str.size() - 1);
+                if (geometry_str.size() > 0) {
+                    geometry += geometry_str + ",";
+                }
             }
         } else {
-            ss << std::setprecision(12) << bg::wkt(pit->linestring);
-            geometry_str = ss.str();
-            // Erase "LINESTRING("
-            geometry_str.erase(0,11);
-            geometry_str.erase(geometry_str.size() - 1);
-            if (geometry_str.size() > 0) {
-                geometry += "(" + geometry_str + "),";
+            if (bg::num_points(pit->linestring) > 0) {
+                ss << std::setprecision(12) << bg::wkt(pit->linestring);
+                geometry_str = ss.str();
+                // Erase "LINESTRING("
+                geometry_str.erase(0,11);
+                geometry_str.erase(geometry_str.size() - 1);
+                if (geometry_str.size() > 0) {
+                    geometry += "(" + geometry_str + "),";
+                }
             }
         }
     }

diff --git a/src/raw/queryraw.cc b/src/raw/queryraw.cc
@@ -308,6 +308,15 @@ QueryRaw::applyChange(const OsmWay &way) const
 
                 query += fmt.str();
             }
+            std::string delquery = "DELETE FROM %s WHERE osm_id=%d;";
+            boost::format delquery_fmt(delquery);
+            if (tableName == &QueryRaw::polyTable) {
+                delquery_fmt % QueryRaw::lineTable;
+            } else {
+                delquery_fmt % QueryRaw::polyTable;
+            }
+            delquery_fmt % way.id;
+            query += delquery_fmt.str();
         }
     } else if (way.action == osmobjects::remove) {
         query += "DELETE FROM way_refs WHERE way_id=" + std::to_string(way.id) + ";";

diff --git a/src/testsuite/libunderpass.all/raw-test.cc b/src/testsuite/libunderpass.all/raw-test.cc
@@ -297,6 +297,8 @@ main(int argc, char *argv[])
         }
 
 
+    } else {
+        std::cout << "ERROR: can't connect to the test DB (" << dbconn << " dbname=underpass_test" << ")" << std::endl;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -297,6 +297,8 @@ main(int argc, char *argv[]) @@
             }
+        } else {
+            std::cout << "ERROR: can't connect to the test DB (" << dbconn << " dbname=underpass_test" << ")" << std::endl;
         }
@@ Expand Down @@