Merge pull request #490 from hotosm/feature/relationsProcessing

Feature/relations processing
hotosm · May 6, 2024 · ad61a24 · ad61a24
2 parents 22ca90f + b1ac29b
commit ad61a24
Show file tree

Hide file tree

Showing 50 changed files with 3,007 additions and 681 deletions.
diff --git a/src/bootstrap/bootstrap.cc b/src/bootstrap/bootstrap.cc
@@ -101,7 +101,7 @@ Bootstrap::start(const underpassconfig::UnderpassConfig &config) {
 
     processWays();
     processNodes();
-    // processRelations();
+    processRelations();
 
 }
 
@@ -358,7 +358,7 @@ Bootstrap::threadBootstrapRelationTask(RelationTask relationTask)
     BootstrapTask task;
     int processed = 0;
 
-    // auto relationval = std::make_shared<std::vector<std::shared_ptr<ValidateStatus>>>();
+    auto relationval = std::make_shared<std::vector<std::shared_ptr<ValidateStatus>>>();
 
     // Proccesing relations
     for (size_t i = taskIndex * page_size; i < (taskIndex + 1) * page_size; ++i) {

diff --git a/src/data/pq.cc b/src/data/pq.cc
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2020, 2021, 2023 Humanitarian OpenStreetMap Team
+// Copyright (c) 2020, 2021, 2023, 2024 Humanitarian OpenStreetMap Team
 //
 // This file is part of Underpass.
 //
@@ -160,48 +160,34 @@ Pq::query(const std::string &query)
 std::string
 Pq::escapedString(const std::string &s)
 {
-    std::string newstr;
-    size_t i = 0;
-    while (i < s.size()) {
-        // Single quote (')
-        if (s[i] == '\'') {
-            newstr += "''";
-        // Slash (\)
-        } else if (s[i] == '\\') {
-            newstr += "\\\\";
-        } else {
-            newstr += s[i];
-        }
-        i++;
-    }
-    return sdb->esc(newstr);
+    return sdb->esc(s);
 }
 
 std::string
 Pq::escapedJSON(const std::string &s) {
     std::ostringstream o;
     for (auto c = s.cbegin(); c != s.cend(); c++) {
         switch (*c) {
-        case '\x00': o << "\\u0000"; break;
-        case '\x01': o << " "; break;
-        case '\x02': o << " "; break;
-        case '\x03': o << " "; break;
-        case '\x04': o << " "; break;
-        case '\x05': o << " "; break;
-        case '\x06': o << " "; break;
-        case '\x07': o << " "; break;
-        case '\x08': o << " "; break;
-        case '\x09': o << " "; break;
-        case '\x0a': o << "\\n"; break;
-        case '\x0b': o << " "; break;
-        case '\x0c': o << " "; break;
-        case '\x0d': o << " "; break;
-        case '\x0e': o << " "; break;
-        case '\xfe': o << " "; break;
-        case '\x1f': o << "\\u001f"; break;
-        case '\x22': o << "\\\""; break;
-        case '\x5c': o << "\\\\"; break;
-        default: o << *c;
+            case '\x00': o << "\\u0000"; break;
+            case '\x01': o << " "; break;
+            case '\x02': o << " "; break;
+            case '\x03': o << " "; break;
+            case '\x04': o << " "; break;
+            case '\x05': o << " "; break;
+            case '\x06': o << " "; break;
+            case '\x07': o << " "; break;
+            case '\x08': o << " "; break;
+            case '\x09': o << " "; break;
+            case '\x0a': o << "\n"; break;
+            case '\x0b': o << " "; break;
+            case '\x0c': o << " "; break;
+            case '\x0d': o << " "; break;
+            case '\x0e': o << " "; break;
+            case '\xfe': o << " "; break;
+            case '\x1f': o << "\\u001f"; break;
+            case '\x22': o << "\""; break;
+            case '\x5c': o << "\\"; break;
+            default: o << *c;
         }
     }
     return o.str();

diff --git a/src/osm/changeset.cc b/src/osm/changeset.cc
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2020, 2021, 2022, 2023 Humanitarian OpenStreetMap Team
+// Copyright (c) 2020, 2021, 2022, 2023, 2024 Humanitarian OpenStreetMap Team
 //
 // This file is part of Underpass.
 //