Skip to content

Fix ID comparison in osmium merge to match osmium sort behavior #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zihaooo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix ID comparison in osmium merge to match osmium sort behavior #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/command_merge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <osmium/memory/buffer.hpp>
#include <osmium/osm/entity_bits.hpp>
#include <osmium/osm/object.hpp>
#include <osmium/osm/object_comparisons.hpp>
#include <osmium/util/verbose_output.hpp>

#include <boost/program_options.hpp>
Expand Down Expand Up @@ -146,10 +147,11 @@ namespace {
return true;
}

if (m_iterator->id() < m_last_id) {
static constexpr osmium::id_order id_cmp{};
if (id_cmp(m_iterator->id(), m_last_id)) {
throw std::runtime_error{"Objects in input file '" + m_name + "' out of order (smaller ids must come first)."};
}
if (m_iterator->id() > m_last_id) {
if (id_cmp(m_last_id, m_iterator->id())) {
m_last_id = m_iterator->id();
m_last_version = m_iterator->version();
return true;
Expand Down