Merge pull request #1251 from joto/warning-negative-ids

Check for negative object ids in input files and output a warning

Author: lonvia

src/input-handler.cpp

@@ -9,8 +9,24 @@ input_handler_t::input_handler_t(osmium::Box const &bbox, bool append,
 : m_data(osmdata), m_bbox(bbox), m_append(append)
 {}
 
+void input_handler_t::negative_id_warning()
+{
+    fmt::print(
+        stderr,
+        "\nWARNING: The input file contains at least one object with a\n"
+        "         negative id. Negative ids are not properly supported\n"
+        "         in osm2pgsql (and never were). They will not work in\n"
+        "         future versions at all. You can use the osmium tool to\n"
+        "         'renumber' your file.\n\n");
+    m_issued_warning_negative_id = true;
+}
+
 void input_handler_t::node(osmium::Node const &node)
 {
+    if (node.id() < 0 && !m_issued_warning_negative_id) {
+        negative_id_warning();
+    }
+
     if (m_type != osmium::item_type::node) {
         m_type = osmium::item_type::node;
         m_data->flush();
@@ -50,6 +66,10 @@ void input_handler_t::node(osmium::Node const &node)
 
 void input_handler_t::way(osmium::Way &way)
 {
+    if (way.id() < 0 && !m_issued_warning_negative_id) {
+        negative_id_warning();
+    }
+
     if (m_type != osmium::item_type::way) {
         m_type = osmium::item_type::way;
         m_data->flush();
@@ -73,6 +93,10 @@ void input_handler_t::way(osmium::Way &way)
 
 void input_handler_t::relation(osmium::Relation const &rel)
 {
+    if (rel.id() < 0 && !m_issued_warning_negative_id) {
+        negative_id_warning();
+    }
+
     if (m_type != osmium::item_type::relation) {
         m_type = osmium::item_type::relation;
         m_data->flush();

src/input-handler.hpp

@@ -36,6 +36,8 @@ class input_handler_t : public osmium::handler::Handler
     progress_display_t const &progress() const noexcept { return m_progress; }
 
 private:
+    void negative_id_warning();
+
     osmdata_t const *m_data;
 
     // Bounding box for node import (or invalid Box if everything should be
@@ -50,6 +52,9 @@ class input_handler_t : public osmium::handler::Handler
 
     // Are we running in append mode?
     bool m_append;
+
+    // Has a warning about a negative id already been issued?
+    bool m_issued_warning_negative_id = false;
 };
 
 #endif // OSM2PGSQL_INPUT_HANDLER_HPP