Skip to content
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

Move pgsql deprecation check to right spot #2255

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Move pgsql deprecation check to right spot #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98d6df0
Move pgsql deprecation check to right spot
joto Sep 19, 2024
103c289
CI: Remove macOS 12
joto Sep 19, 2024
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
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ jobs:
fail-fast: false
matrix:
os:
- "macos-12"
- "macos-13"
- "macos-14" # latest
runs-on: ${{ matrix.os }}
Expand Down
4 changes: 0 additions & 4 deletions src/command-line-parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,6 @@ void check_options_output_null(CLI::App const &app)

void check_options_output_pgsql(CLI::App const &app, options_t *options)
{
log_warn("The pgsql (default) output is deprecated. For details see "
"https://osm2pgsql.org/doc/"
"faq.html#the-pgsql-output-is-deprecated-what-does-that-mean");

if (app.count("--latlong") + app.count("--merc") + app.count("--proj") >
1) {
throw std::runtime_error{"You can only use one of --latlong, -l, "
Expand Down
4 changes: 4 additions & 0 deletions src/output-pgsql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,10 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
m_area_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
{
log_warn("The pgsql (default) output is deprecated. For details see "
"https://osm2pgsql.org/doc/"
"faq.html#the-pgsql-output-is-deprecated-what-does-that-mean");

m_expire_config.full_area_limit = get_options()->expire_tiles_max_bbox;
if (get_options()->expire_tiles_max_bbox > 0.0) {
m_expire_config.mode = expire_mode::hybrid;
Expand Down
Loading