Merge pull request #1505 from joto/misc-cleanup

Various very small changes

Author: lonvia

README.md

@@ -143,6 +143,9 @@ following:
 cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON
 ```
 
+Note that `Debug` builds will be much slower than release build. For production
+use `Release` or `RelWithDebInfo` builds are recommended.
+
 ### Using the PROJ library
 
 Osm2pgsql has builtin support for the Latlong (WGS84, EPSG:4326) and the

src/db-copy.cpp

@@ -129,6 +129,10 @@ void db_copy_thread_t::thread_t::operator()()
         // Let commits happen faster by delaying when they actually occur.
         m_conn->exec("SET synchronous_commit = off");
 
+        // Do not show messages about invalid geometries (they are removed
+        // by the trigger).
+        m_conn->exec("SET client_min_messages = WARNING");
+
         bool done = false;
         while (!done) {
             std::unique_ptr<db_cmd_t> item;

src/thread-pool.cpp

@@ -16,7 +16,7 @@ std::chrono::milliseconds task_result_t::wait()
 
         // Make sure the result is not 0 so it is different than
         // "no result yet".
-        if (m_result.count() == 0) {
+        if (m_result == std::chrono::milliseconds::zero()) {
             ++m_result;
         }
     }

tests/test-node-locations.cpp

@@ -87,7 +87,15 @@ TEST_CASE("huge ids should work", "[NoDB]")
 
     REQUIRE(nl.size() == 4);
 
+    REQUIRE(nl.get(1ULL) == osmium::Location{1.0, 9.9});
+    REQUIRE(nl.get(1ULL << 16U) == osmium::Location{1.1, 9.8});
+    REQUIRE(nl.get(1ULL << 32U) == osmium::Location{1.2, 9.7});
     REQUIRE(nl.get(1ULL << 48U) == osmium::Location{1.3, 9.6});
+
+    REQUIRE(nl.get(2ULL) == osmium::Location{});
+    REQUIRE(nl.get(1ULL << 40U) == osmium::Location{});
+    REQUIRE(nl.get((1ULL << 48U) + 1U) == osmium::Location{});
+    REQUIRE(nl.get((1ULL << 48U) - 1U) == osmium::Location{});
 }
 
 TEST_CASE("full node locations store", "[NoDB]")