10 Commits

Author SHA1 Message Date
879002bab9 Use UPPER_CASE for more global constants 2025-08-04 20:33:40 +02:00
ede8880e72 Update copyright date 2025-01-13 09:07:30 +01:00
7b6ed0d2bc Use anonymous namespace instead of static in test code
This is recommended in C++ Core Guidelines SF.22
https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rs-unnamed2
2024-08-15 22:24:35 +02:00
ff91d49869 Update copyright date 2024-01-26 16:45:53 +01:00
7ba523ba37 Update copyright date to 2023 2023-01-15 16:13:42 +01:00
45aa0b3100 Add lots of const's to the code 2023-01-06 20:25:43 +01:00
56d5145615 Updates copyright date to 2022 in all files 2022-01-11 14:30:34 +01:00
d45018f88b Update copyright year to 2021 2021-01-28 09:38:17 +01:00
61bdfb4bc5 Add/update copyright notice on all C++ files
This adds a copyright notice to all C++ files and the README clarifying
the license. (There is no change of the license.) This also removes a
few names explicitly mentioned as copyright holders, instead refering to
the git log which has a full list of all osm2pgsql developers. (There is
also still the AUTHORS file which names the most important developers.)

The only exception is the sprompt.cpp file which was taken from
PostgreSQL and keeps its original license information (and, of course,
the files in contrib).
2020-12-19 11:25:07 +01:00
acd6b46d98 Improve handling of multiple input files
Osm2pgsql can handle any number of input files. The old code will just
read the files one after the other which will not work if there is any
overlap between the files, i.e. if the same object is in two input
files.

The new code will read the files in parallel. We construct a priority
queue feeding in the next objects from all input files, taking off the
"smallest" one by one. If the same object is in multiple files, we
only process it once.

If there is only a single input file a shortcut is taken which basically
behaves like the old code.

Note that the input files have to be from the same point in time. If
there are multiple versions of the same object in the input, this will
still not magically work.

This commit removes support for unsorted input files which were already
deprecated.

See #1167

This commit removes support for negative ids which were already
deprecated.

Fixes #1097
2020-11-25 14:14:18 +01:00