Merge commit 'a3a7a822e136d2357660d85124d8e7bb26ea6f7c' into subtrees-protozero-vtzero

third_party/libosmium/test/data-tests/include/check_basics_handler.hpp

@@ -34,13 +34,13 @@ class CheckBasicsHandler : public osmium::handler::Handler {
     void id_check(osmium::object_id_type id, osmium::object_id_type min, osmium::object_id_type max) {
         if (id < m_id_range + min || id > m_id_range + max) {
             std::cerr << "  id " << id << " out of range for this test case\n";
-            exit(1);
+            std::exit(1);
         }
 
         auto r = m_ids.insert(id);
         if (!r.second) {
             std::cerr << "  id " << id << " contained twice in data.osm\n";
-            exit(1);
+            std::exit(1);
         }
     }
 
@@ -59,15 +59,15 @@ public:
     ~CheckBasicsHandler() {
         if (m_num_nodes != 0) {
             std::cerr << "  wrong number of nodes in data.osm\n";
-            exit(1);
+            std::exit(1);
         }
         if (m_num_ways != 0) {
             std::cerr << "  wrong number of ways in data.osm\n";
-            exit(1);
+            std::exit(1);
         }
         if (m_num_relations != 0) {
             std::cerr << "  wrong number of relations in data.osm\n";
-            exit(1);
+            std::exit(1);
         }
     }
 

third_party/libosmium/test/data-tests/include/check_wkt_handler.hpp

@@ -17,25 +17,25 @@ class CheckWKTHandler : public osmium::handler::Handler {
     osmium::geom::WKTFactory<> m_factory;
 
     void read_wkt_file(const std::string& filename) {
-        std::ifstream in(filename, std::ifstream::in);
+        std::ifstream in{filename, std::ifstream::in};
         if (in) {
             osmium::object_id_type id;
             std::string line;
             while (std::getline(in, line)) {
-                size_t pos = line.find_first_of(' ');
+                const std::size_t pos = line.find_first_of(' ');
 
                 if (pos == std::string::npos) {
                     std::cerr << filename << " not formatted correctly\n";
-                    exit(1);
+                    std::exit(1);
                 }
 
                 std::string id_str = line.substr(0, pos);
-                std::istringstream iss(id_str);
+                std::istringstream iss{id_str};
                 iss >> id;
 
                 if (m_geometries.find(id) != m_geometries.end()) {
                      std::cerr << filename + " contains id " << id << "twice\n";
-                     exit(1);
+                     std::exit(1);
                 }
 
                 m_geometries[id] = line.substr(pos+1);
@@ -58,7 +58,7 @@ public:
             for (const auto& geom : m_geometries) {
                 std::cerr << "geometry id " << geom.first << " not in data.osm.\n";
             }
-            exit(1);
+            std::exit(1);
         }
     }
 
@@ -66,7 +66,7 @@ public:
         const std::string wkt = m_geometries[node.id()];
         assert(wkt != "" && "Missing geometry for node in nodes.wkt");
 
-        std::string this_wkt = m_factory.create_point(node.location());
+        const std::string this_wkt = m_factory.create_point(node.location());
         assert(wkt == this_wkt && "wkt geometries don't match");
         m_geometries.erase(node.id());
     }
@@ -75,8 +75,10 @@ public:
         const std::string wkt = m_geometries[way.id()];
         assert(wkt != "" && "Missing geometry for way in ways.wkt");
 
-        std::string this_wkt = m_factory.create_linestring(way);
-        assert(wkt == this_wkt && "wkt geometries don't match");
+        if (wkt != "NULL") {
+            const std::string this_wkt = m_factory.create_linestring(way);
+            assert(wkt == this_wkt && "wkt geometries don't match");
+        }
         m_geometries.erase(way.id());
     }