Move warning from cmds to io.cpp

Author: afarber

src/command_add_locations_to_ways.cpp

@@ -198,7 +198,7 @@ bool CommandAddLocationsToWays::run() {
         m_vout << "Copying input file '" << m_input_files[0].filename() << "'...\n";
         osmium::io::Reader reader{m_input_files[0]};
         osmium::io::Header header{reader.header()};
-        setup_header(header, reader.header());
+        setup_header(header);
         writer.set_header(header);
 
         osmium::ProgressBar progress_bar{reader.file_size(), display_progress()};
@@ -208,22 +208,15 @@ bool CommandAddLocationsToWays::run() {
         writer.close();
         reader.close();
     } else { // multiple input files
-        osmium::io::Header first_input_header;
-        bool first_file = true;
-        
+        osmium::io::Header header;
+        setup_header(header);
+        writer.set_header(header);
+
         osmium::ProgressBar progress_bar{file_size_sum(m_input_files), display_progress()};
         for (const auto& input_file : m_input_files) {
             progress_bar.remove();
             m_vout << "Copying input file '" << input_file.filename() << "'...\n";
             osmium::io::Reader reader{input_file};
-            
-            if (first_file) {
-                first_input_header = reader.header();
-                osmium::io::Header header;
-                setup_header(header, first_input_header);
-                writer.set_header(header);
-                first_file = false;
-            }
 
             copy_data(progress_bar, reader, writer, location_handler);
 

src/command_cat.cpp

@@ -162,7 +162,7 @@ bool CommandCat::run() {
 
         report_filename(&m_vout, m_input_files[0], reader);
 
-        setup_header(header, reader.header());
+        setup_header(header);
         osmium::io::Writer writer{m_output_file, header, m_output_overwrite, m_fsync};
 
         if (m_buffer_data) {

src/command_sort.cpp

@@ -110,8 +110,7 @@ bool CommandSort::run_single_pass() {
     osmium::ObjectPointerCollection objects;
 
     osmium::Box bounding_box;
-    osmium::io::Header first_input_header;
-    bool first_file = true;
+    osmium::io::Header merged_input_header;
 
     uint64_t buffers_count = 0;
     uint64_t buffers_size = 0;
@@ -122,11 +121,12 @@ bool CommandSort::run_single_pass() {
     for (const auto& file : m_input_files) {
         osmium::io::Reader reader{file, osmium::osm_entity_bits::object};
         const osmium::io::Header header{reader.header()};
-        if (first_file) {
-            first_input_header = header;
-            first_file = false;
-        }
         bounding_box.extend(header.joined_boxes());
+        
+        // Merge input header info for warning detection
+        for (const auto& option : header) {
+            merged_input_header.set(option.first, option.second);
+        }
         while (osmium::memory::Buffer buffer = reader.read()) {
             ++buffers_count;
             buffers_size += buffer.committed();
@@ -152,7 +152,7 @@ bool CommandSort::run_single_pass() {
 
     m_vout << "Opening output file...\n";
     osmium::io::Header header;
-    setup_header(header, first_input_header);
+    setup_header(header, merged_input_header);
     header.set("sorting", "Type_then_ID");
     if (bounding_box) {
         header.add_box(bounding_box);
@@ -179,24 +179,24 @@ bool CommandSort::run_multi_pass() {
     osmium::io::Writer writer{m_output_file, m_output_overwrite, m_fsync};
 
     osmium::Box bounding_box;
-    osmium::io::Header first_input_header;
-    bool first_file = true;
+    osmium::io::Header merged_input_header;
 
     m_vout << "Reading input file headers...\n";
     for (const auto& file : m_input_files) {
         osmium::io::Reader reader{file, osmium::osm_entity_bits::nothing};
         const osmium::io::Header header{reader.header()};
-        if (first_file) {
-            first_input_header = header;
-            first_file = false;
-        }
         bounding_box.extend(header.joined_boxes());
+        
+        // Merge input header info for warning detection
+        for (const auto& option : header) {
+            merged_input_header.set(option.first, option.second);
+        }
         reader.close();
     }
 
     m_vout << "Opening output file...\n";
     osmium::io::Header header;
-    setup_header(header, first_input_header);
+    setup_header(header, merged_input_header);
     if (bounding_box) {
         header.add_box(bounding_box);
     }

src/io.cpp

@@ -210,6 +210,21 @@ void with_osm_output::setup_header(osmium::io::Header& header) const {
     for (const auto& h : m_output_headers) {
         header.set(h);
     }
+    
+    // Check if input PBF has locations_on_ways but output format won't preserve them
+    bool has_locations_on_ways = false;
+    for (const auto& option : header) {
+        if (option.first.find("pbf_optional_feature") != std::string::npos && 
+            option.second == "LocationsOnWays") {
+            has_locations_on_ways = true;
+            break;
+        }
+    }
+    
+    if (has_locations_on_ways && m_output_format.find("locations_on_ways") == std::string::npos) {
+        std::cerr << "Warning! Input file contains locations on ways that will be lost in output.\n";
+        std::cerr << "Use --output-format with locations_on_ways option to preserve node locations on ways.\n";
+    }
 }
 
 void init_header(osmium::io::Header& header, const osmium::io::Header& input_header, const std::vector<std::string>& options) {