Skip to content

Commit

Permalink
Merge pull request #2255 from joto/fix-depre-msg
Browse files Browse the repository at this point in the history
Move pgsql deprecation check to right spot
  • Loading branch information
lonvia authored Sep 19, 2024
2 parents 9ed53e5 + 103c289 commit 5a6a4d8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
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
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
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

0 comments on commit 5a6a4d8

Please sign in to comment.