Merge pull request #503 from hotosm/fix/validationQueries

Fix for validation DB queries

Author: emi420

src/raw/queryraw.cc

@@ -562,7 +562,7 @@ QueryRaw::getWaysByIds(std::string &waysIds, std::map<long, std::shared_ptr<osmo
 #endif
     // Get Ways and it's geometries (Polygon and LineString)
     std::string waysQuery = "SELECT distinct(osm_id), ST_AsText(geom, 4326), 'polygon' as type from ways_poly wp where osm_id = any(ARRAY[" + waysIds + "]) ";
-    waysQuery += "UNION SELECT distinct(osm_id), ST_AsText(geom, 4326), 'linestring' as type from ways_line wp where osm_id = any(ARRAY[" + waysIds + "])";
+    waysQuery += "UNION SELECT distinct(osm_id), ST_AsText(geom, 4326), 'linestring' as type from ways_line wp where osm_id = any(ARRAY[" + waysIds + "]);";
     auto ways_result = dbconn->query(waysQuery);
     if (ways_result.size() == 0) {
         log_debug("No results returned!");
@@ -862,10 +862,8 @@ QueryRaw::getWaysByNodesRefs(std::string &nodeIds) const
 
     // Get all Ways that have references to Nodes from the DB, including Polygons and LineString geometries
     // std::string waysQuery = "SELECT distinct(osm_id), refs, version, tags, uid, changeset from way_refs join ways_poly wp on wp.osm_id = way_id where node_id = any(ARRAY[" + nodeIds + "])";
-    queries.push_back("SELECT distinct(osm_id), refs, version, tags, uid, changeset from ways_poly where refs @> '{" + nodeIds + "}'");
-
-    queries.push_back("SELECT distinct(osm_id), refs, version, tags, uid, changeset from ways_line where refs @> '{" + nodeIds + "}'");
-    // waysQuery += " UNION SELECT distinct(osm_id), refs, version, tags, uid, changeset from way_refs join ways_line wl on wl.osm_id = way_id where node_id = any(ARRAY[" + nodeIds + "]);";
+    queries.push_back("SELECT distinct(osm_id), refs, version, tags, uid, changeset from ways_poly where refs @> '{" + nodeIds + "}';");
+    queries.push_back("SELECT distinct(osm_id), refs, version, tags, uid, changeset from ways_line where refs @> '{" + nodeIds + "}';");
 
     for (auto it = queries.begin(); it != queries.end(); ++it) {
 

src/replicator/threads.cc

@@ -614,30 +614,29 @@ threadOsmChange(OsmChangeTask osmChangeTask)
         }
     }
 
-    // // Update validation table
+    // Update validation table
     if (!config->disable_validation) {
 
         // Validate ways
         auto wayval = osmchanges->validateWays(poly, plugin);
-        for (auto it = task.query.begin(); it != task.query.end(); ++it) {
-            auto result = queryvalidate->ways(wayval, validation_removals);
-            for (auto itt = result->begin(); itt != result->end(); ++itt) {
-                task.query.push_back(*itt);
-            }
+        auto wayval_queries = queryvalidate->ways(wayval, validation_removals);
+        for (auto itt = wayval_queries->begin(); itt != wayval_queries->end(); ++itt) {
+            task.query.push_back(*itt);
         }
 
         // Validate nodes
         auto nodeval = osmchanges->validateNodes(poly, plugin);
-        for (auto it = task.query.begin(); it != task.query.end(); ++it) {
-            auto result = queryvalidate->nodes(nodeval, validation_removals);
-            for (auto itt = result->begin(); itt != result->end(); ++itt) {
-                task.query.push_back(*itt);
-            }
+        auto nodeval_queries = queryvalidate->nodes(nodeval, validation_removals);
+        for (auto itt = nodeval_queries->begin(); itt != nodeval_queries->end(); ++itt) {
+            task.query.push_back(*itt);
         }
 
         // Validate relations
-        // relval = osmchanges->validateRelations(poly, plugin);
-        // queryvalidate->relations(relval, task.query, validation_removals);
+        // auto relval = osmchanges->validateRelations(poly, plugin);
+        // auto relval_queries = queryvalidate->relations(relval, validation_removals);
+        // for (auto itt = relval_queries->begin(); itt != relval_queries->end(); ++itt) {
+        //     task.query.push_back(*itt);
+        // }
 
         // Remove validation entries for removed objects
         task.query.push_back(*queryvalidate->updateValidation(validation_removals));