From 98d6df0514830b9754c85798409b7119fac259e9 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Thu, 19 Sep 2024 09:18:24 +0200 Subject: [PATCH 1/2] Move pgsql deprecation check to right spot The check was in the wrong position. When running updates the output is read from the osm2pgsql_properties table which only happened after the check, so you'd still see the message even if you are using the flex output. Sorry about that. --- src/command-line-parser.cpp | 4 ---- src/output-pgsql.cpp | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/command-line-parser.cpp b/src/command-line-parser.cpp index b5b42e109..ed2fdfb6f 100644 --- a/src/command-line-parser.cpp +++ b/src/command-line-parser.cpp @@ -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, " diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp index 896683636..67e92d5d1 100644 --- a/src/output-pgsql.cpp +++ b/src/output-pgsql.cpp @@ -442,6 +442,10 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr 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; From 103c289fbb74e1565d8169b0ac44c6c07153eccf Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Thu, 19 Sep 2024 11:08:37 +0200 Subject: [PATCH 2/2] CI: Remove macOS 12 --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bbb503c4..9cdd783c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,6 @@ jobs: fail-fast: false matrix: os: - - "macos-12" - "macos-13" - "macos-14" # latest runs-on: ${{ matrix.os }}